Page MenuHomeFreeBSD
Files F148792153

D8498.diff
No OneTemporary
Actions

D8498.diff
View Options

Index: head/sys/net/rtsock.c
===================================================================
--- head/sys/net/rtsock.c
+++ head/sys/net/rtsock.c
@@ -1566,8 +1566,8 @@
}
static int
-sysctl_iflist_ifml(struct ifnet *ifp, struct rt_addrinfo *info,
- struct walkarg *w, int len)
+sysctl_iflist_ifml(struct ifnet *ifp, const struct if_data *src_ifd,
+ struct rt_addrinfo *info, struct walkarg *w, int len)
{
struct if_msghdrl *ifm;
struct if_data *ifd;
@@ -1598,14 +1598,14 @@
ifd = &ifm->ifm_data;
}
- if_data_copy(ifp, ifd);
+ memcpy(ifd, src_ifd, sizeof(*ifd));
return (SYSCTL_OUT(w->w_req, (caddr_t)ifm, len));
}
static int
-sysctl_iflist_ifm(struct ifnet *ifp, struct rt_addrinfo *info,
- struct walkarg *w, int len)
+sysctl_iflist_ifm(struct ifnet *ifp, const struct if_data *src_ifd,
+ struct rt_addrinfo *info, struct walkarg *w, int len)
{
struct if_msghdr *ifm;
struct if_data *ifd;
@@ -1630,7 +1630,7 @@
ifd = &ifm->ifm_data;
}
- if_data_copy(ifp, ifd);
+ memcpy(ifd, src_ifd, sizeof(*ifd));
return (SYSCTL_OUT(w->w_req, (caddr_t)ifm, len));
}
@@ -1705,15 +1705,18 @@
{
struct ifnet *ifp;
struct ifaddr *ifa;
+ struct if_data ifd;
struct rt_addrinfo info;
int len, error = 0;
struct sockaddr_storage ss;
bzero((caddr_t)&info, sizeof(info));
+ bzero(&ifd, sizeof(ifd));
IFNET_RLOCK_NOSLEEP();
TAILQ_FOREACH(ifp, &V_ifnet, if_link) {
if (w->w_arg && w->w_arg != ifp->if_index)
continue;
+ if_data_copy(ifp, &ifd);
IF_ADDR_RLOCK(ifp);
ifa = ifp->if_addr;
info.rti_info[RTAX_IFP] = ifa->ifa_addr;
@@ -1723,9 +1726,11 @@
info.rti_info[RTAX_IFP] = NULL;
if (w->w_req && w->w_tmem) {
if (w->w_op == NET_RT_IFLISTL)
- error = sysctl_iflist_ifml(ifp, &info, w, len);
+ error = sysctl_iflist_ifml(ifp, &ifd, &info, w,
+ len);
else
- error = sysctl_iflist_ifm(ifp, &info, w, len);
+ error = sysctl_iflist_ifm(ifp, &ifd, &info, w,
+ len);
if (error)
goto done;
}

File Metadata

Mime Type
text/plain
Expires
Sat, Mar 21, 6:11 AM (19 h, 50 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
30065754
Default Alt Text
D8498.diff (1 KB)

Event Timeline