Merge branch 'master' into net-next
This commit is contained in:
commit
731e28cc28
|
|
@ -1025,7 +1025,7 @@ int iplink_get(unsigned int flags, char *name, __u32 filt_mask)
|
|||
};
|
||||
struct {
|
||||
struct nlmsghdr n;
|
||||
char buf[16384];
|
||||
char buf[32768];
|
||||
} answer;
|
||||
|
||||
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)
|
||||
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);
|
||||
if (brief)
|
||||
|
|
|
|||
Loading…
Reference in New Issue