Page MenuHomeFreeBSD
Files F147469440

D47662.id146658.diff
No OneTemporary
Actions

D47662.id146658.diff
View Options

diff --git a/sys/net/rtsock.c b/sys/net/rtsock.c
--- a/sys/net/rtsock.c
+++ b/sys/net/rtsock.c
@@ -921,8 +921,10 @@
*/
}
- w.w_tmem = (caddr_t)rtm;
- w.w_tmemsize = alloc_len;
+ w = (struct walkarg ){
+ .w_tmem = (caddr_t)rtm,
+ .w_tmemsize = alloc_len,
+ };
rtsock_msg_buffer(rtm->rtm_type, info, &w, &len);
rtm->rtm_addrs = info->rti_addrs;
@@ -1774,7 +1776,10 @@
struct sockaddr_in6 *sin6;
#endif
#ifdef COMPAT_FREEBSD32
- bool compat32 = false;
+ bool compat32;
+
+ compat32 = w != NULL && w->w_req != NULL &&
+ (w->w_req->flags & SCTL_MASK32);
#endif
switch (type) {
@@ -1782,10 +1787,9 @@
case RTM_NEWADDR:
if (w != NULL && w->w_op == NET_RT_IFLISTL) {
#ifdef COMPAT_FREEBSD32
- if (w->w_req->flags & SCTL_MASK32) {
+ if (compat32)
len = sizeof(struct ifa_msghdrl32);
- compat32 = true;
- } else
+ else
#endif
len = sizeof(struct ifa_msghdrl);
} else
@@ -1793,20 +1797,21 @@
break;
case RTM_IFINFO:
+ if (w != NULL && w->w_op == NET_RT_IFLISTL) {
#ifdef COMPAT_FREEBSD32
- if (w != NULL && w->w_req->flags & SCTL_MASK32) {
- if (w->w_op == NET_RT_IFLISTL)
+ if (compat32)
len = sizeof(struct if_msghdrl32);
else
+#endif
+ len = sizeof(struct if_msghdrl);
+ } else {
+#ifdef COMPAT_FREEBSD32
+ if (compat32)
len = sizeof(struct if_msghdr32);
- compat32 = true;
- break;
- }
+ else
#endif
- if (w != NULL && w->w_op == NET_RT_IFLISTL)
- len = sizeof(struct if_msghdrl);
- else
- len = sizeof(struct if_msghdr);
+ len = sizeof(struct if_msghdr);
+ }
break;
case RTM_NEWMADDR:

File Metadata

Mime Type
text/plain
Expires
Thu, Mar 12, 6:27 AM (12 h, 8 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
29568531
Default Alt Text
D47662.id146658.diff (1 KB)

Event Timeline