Skip to content

Commit 3bf39fa

Browse files
committed
netlink: fix false positive warning in extack during dumps
Commit under fixes extended extack reporting to dumps. It works under normal conditions, because extack errors are usually reported during ->start() or the first ->dump(), it's quite rare that the dump starts okay but fails later. If the dump does fail later, however, the input skb will already have the initiating message pulled, so checking if bad attr falls within skb->data will fail. Switch the check to using nlh, which is always valid. syzbot found a way to hit that scenario by filling up the receive queue. In this case we initiate a dump but don't call ->dump() until there is read space for an skb. WARNING: CPU: 1 PID: 5845 at net/netlink/af_netlink.c:2210 netlink_ack_tlv_fill+0x1a8/0x560 net/netlink/af_netlink.c:2209 RIP: 0010:netlink_ack_tlv_fill+0x1a8/0x560 net/netlink/af_netlink.c:2209 Call Trace: <TASK> netlink_dump_done+0x513/0x970 net/netlink/af_netlink.c:2250 netlink_dump+0x91f/0xe10 net/netlink/af_netlink.c:2351 netlink_recvmsg+0x6bb/0x11d0 net/netlink/af_netlink.c:1983 sock_recvmsg_nosec net/socket.c:1051 [inline] sock_recvmsg+0x22f/0x280 net/socket.c:1073 __sys_recvfrom+0x246/0x3d0 net/socket.c:2267 __do_sys_recvfrom net/socket.c:2285 [inline] __se_sys_recvfrom net/socket.c:2281 [inline] __x64_sys_recvfrom+0xde/0x100 net/socket.c:2281 do_syscall_x64 arch/x86/entry/common.c:52 [inline] do_syscall_64+0xf3/0x230 arch/x86/entry/common.c:83 entry_SYSCALL_64_after_hwframe+0x77/0x7f RIP: 0033:0x7ff37dd17a79 Reported-by: [email protected] Fixes: 8af4f60 ("netlink: support all extack types in dumps") Reviewed-by: Jacob Keller <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
1 parent f164b29 commit 3bf39fa

File tree

1 file changed

+11
-10
lines changed

1 file changed

+11
-10
lines changed

net/netlink/af_netlink.c

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2181,9 +2181,14 @@ netlink_ack_tlv_len(struct netlink_sock *nlk, int err,
21812181
return tlvlen;
21822182
}
21832183

2184+
static bool nlmsg_check_in_payload(const struct nlmsghdr *nlh, const void *addr)
2185+
{
2186+
return !WARN_ON(addr < nlmsg_data(nlh) ||
2187+
addr - (const void *) nlh >= nlh->nlmsg_len);
2188+
}
2189+
21842190
static void
2185-
netlink_ack_tlv_fill(struct sk_buff *in_skb, struct sk_buff *skb,
2186-
const struct nlmsghdr *nlh, int err,
2191+
netlink_ack_tlv_fill(struct sk_buff *skb, const struct nlmsghdr *nlh, int err,
21872192
const struct netlink_ext_ack *extack)
21882193
{
21892194
if (extack->_msg)
@@ -2195,9 +2200,7 @@ netlink_ack_tlv_fill(struct sk_buff *in_skb, struct sk_buff *skb,
21952200
if (!err)
21962201
return;
21972202

2198-
if (extack->bad_attr &&
2199-
!WARN_ON((u8 *)extack->bad_attr < in_skb->data ||
2200-
(u8 *)extack->bad_attr >= in_skb->data + in_skb->len))
2203+
if (extack->bad_attr && nlmsg_check_in_payload(nlh, extack->bad_attr))
22012204
WARN_ON(nla_put_u32(skb, NLMSGERR_ATTR_OFFS,
22022205
(u8 *)extack->bad_attr - (const u8 *)nlh));
22032206
if (extack->policy)
@@ -2206,9 +2209,7 @@ netlink_ack_tlv_fill(struct sk_buff *in_skb, struct sk_buff *skb,
22062209
if (extack->miss_type)
22072210
WARN_ON(nla_put_u32(skb, NLMSGERR_ATTR_MISS_TYPE,
22082211
extack->miss_type));
2209-
if (extack->miss_nest &&
2210-
!WARN_ON((u8 *)extack->miss_nest < in_skb->data ||
2211-
(u8 *)extack->miss_nest > in_skb->data + in_skb->len))
2212+
if (extack->miss_nest && nlmsg_check_in_payload(nlh, extack->miss_nest))
22122213
WARN_ON(nla_put_u32(skb, NLMSGERR_ATTR_MISS_NEST,
22132214
(u8 *)extack->miss_nest - (const u8 *)nlh));
22142215
}
@@ -2237,7 +2238,7 @@ static int netlink_dump_done(struct netlink_sock *nlk, struct sk_buff *skb,
22372238
if (extack_len) {
22382239
nlh->nlmsg_flags |= NLM_F_ACK_TLVS;
22392240
if (skb_tailroom(skb) >= extack_len) {
2240-
netlink_ack_tlv_fill(cb->skb, skb, cb->nlh,
2241+
netlink_ack_tlv_fill(skb, cb->nlh,
22412242
nlk->dump_done_errno, extack);
22422243
nlmsg_end(skb, nlh);
22432244
}
@@ -2496,7 +2497,7 @@ void netlink_ack(struct sk_buff *in_skb, struct nlmsghdr *nlh, int err,
24962497
}
24972498

24982499
if (tlvlen)
2499-
netlink_ack_tlv_fill(in_skb, skb, nlh, err, extack);
2500+
netlink_ack_tlv_fill(skb, nlh, err, extack);
25002501

25012502
nlmsg_end(skb, rep);
25022503

0 commit comments

Comments
 (0)