* [PATCH net] netlink: Use netlink header as base to calculate bad attribute offset
@ 2020-02-26 18:47 Pablo Neira Ayuso
2020-03-01 5:22 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Pablo Neira Ayuso @ 2020-02-26 18:47 UTC (permalink / raw)
To: netdev; +Cc: netfilter-devel, davem, johannes.berg
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>
---
net/netlink/af_netlink.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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,
--
2.11.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH net] netlink: Use netlink header as base to calculate bad attribute offset
2020-02-26 18:47 [PATCH net] netlink: Use netlink header as base to calculate bad attribute offset Pablo Neira Ayuso
@ 2020-03-01 5:22 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2020-03-01 5:22 UTC (permalink / raw)
To: pablo; +Cc: netdev, netfilter-devel, johannes.berg
From: Pablo Neira Ayuso <pablo@netfilter.org>
Date: Wed, 26 Feb 2020 19:47:34 +0100
> 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>
Applied and queued up for -stable, thanks Pablo.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-03-01 5:22 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-02-26 18:47 [PATCH net] netlink: Use netlink header as base to calculate bad attribute offset Pablo Neira Ayuso
2020-03-01 5:22 ` David Miller
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.