matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into net-next

This commit is contained in:
Stephen Hemminger 2017-09-01 14:15:31 -07:00
parent 2e706e12d9 460c03f3f3
commit 731e28cc28
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ip/iplink.c
View File

@ -1025,7 +1025,7 @@ int iplink_get(unsigned int flags, char *name, __u32 filt_mask)
}; };
struct { struct {
struct nlmsghdr n; struct nlmsghdr n;
char buf[16384]; char buf[32768];
} answer; } answer;
if (name) { if (name) {
@ -1041,6 +1041,11 @@ int iplink_get(unsigned int flags, char *name, __u32 filt_mask)
if (rtnl_talk(&rth, &req.n, &answer.n, sizeof(answer)) < 0) if (rtnl_talk(&rth, &req.n, &answer.n, sizeof(answer)) < 0)
return -2; return -2;
if (answer.n.nlmsg_len > sizeof(answer.buf)) {
fprintf(stderr, "Message truncated from %u to %lu\n",
answer.n.nlmsg_len, sizeof(answer.buf));
return -2;
}
open_json_object(NULL); open_json_object(NULL);
if (brief) if (brief)