diff options
| author | David S. Miller <davem@davemloft.net> | 2018-06-03 09:31:58 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-06-03 09:31:58 -0400 |
| commit | 9c54aeb03a6d65a5834bd92376e921cbac6dfb8f (patch) | |
| tree | 70441095d58678711d68cfef4934765251425d1f /net/ncsi | |
| parent | eaf47b17a77fda841a1102d76c15161ee438b347 (diff) | |
| parent | 918fe1b3157978ada4267468008c5f89ef101e7d (diff) | |
| download | lwn-9c54aeb03a6d65a5834bd92376e921cbac6dfb8f.tar.gz lwn-9c54aeb03a6d65a5834bd92376e921cbac6dfb8f.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Filling in the padding slot in the bpf structure as a bug fix in 'ne'
overlapped with actually using that padding area for something in
'net-next'.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ncsi')
| -rw-r--r-- | net/ncsi/ncsi-netlink.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ncsi/ncsi-netlink.c b/net/ncsi/ncsi-netlink.c index 99f4c22e2c8f..82e6edf9c5d9 100644 --- a/net/ncsi/ncsi-netlink.c +++ b/net/ncsi/ncsi-netlink.c @@ -208,7 +208,7 @@ err: static int ncsi_pkg_info_all_nl(struct sk_buff *skb, struct netlink_callback *cb) { - struct nlattr *attrs[NCSI_ATTR_MAX]; + struct nlattr *attrs[NCSI_ATTR_MAX + 1]; struct ncsi_package *np, *package; struct ncsi_dev_priv *ndp; unsigned int package_id; |