aboutsummaryrefslogtreecommitdiffstats
path: root/net/netlink/af_netlink.c
diff options
context:
space:
mode:
authorPablo Neira Ayuso <pablo@netfilter.org>2020-02-26 19:47:34 +0100
committerDavid S. Miller <davem@davemloft.net>2020-02-29 21:21:23 -0800
commit84b3268027641401bb8ad4427a90a3cce2eb86f5 (patch)
tree29a8587323b128b72d0629da76eb131b3f55ad05 /net/netlink/af_netlink.c
parentr8152: check disconnect status after long sleep (diff)
downloadlinux-dev-84b3268027641401bb8ad4427a90a3cce2eb86f5.tar.xz
linux-dev-84b3268027641401bb8ad4427a90a3cce2eb86f5.zip
netlink: Use netlink header as base to calculate bad attribute offset
Userspace might send a batch that is composed of several netlink messages. The netlink_ack() function must use the pointer to the netlink header as base to calculate the bad attribute offset. Fixes: 2d4bc93368f5 ("netlink: extended ACK reporting") Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netlink/af_netlink.c')
-rw-r--r--net/netlink/af_netlink.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c
index edf3e285e242..5313f1cec170 100644
--- a/net/netlink/af_netlink.c
+++ b/net/netlink/af_netlink.c
@@ -2434,7 +2434,7 @@ void netlink_ack(struct sk_buff *in_skb, struct nlmsghdr *nlh, int err,
in_skb->len))
WARN_ON(nla_put_u32(skb, NLMSGERR_ATTR_OFFS,
(u8 *)extack->bad_attr -
- in_skb->data));
+ (u8 *)nlh));
} else {
if (extack->cookie_len)
WARN_ON(nla_put(skb, NLMSGERR_ATTR_COOKIE,