Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

netfilter: nf_queue: reject NF_STOLEN verdicts from userspace

A userspace listener may send (bogus) NF_STOLEN verdict, which causes skb leak.

This problem was previously fixed via
64507fdbc29c3a622180378210ecea8659b14e40 (netfilter:
nf_queue: fix NF_STOLEN skb leak) but this had to be reverted because
NF_STOLEN can also be returned by a netfilter hook when iterating the
rules in nf_reinject.

Reject userspace NF_STOLEN verdict, as suggested by Michal Miroslaw.

This is complementary to commit fad54440438a7c231a6ae347738423cbabc936d9
(netfilter: avoid double free in nf_reinject).

Cc: Julian Anastasov <ja@ssi.bg>
Cc: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Patrick McHardy <kaber@trash.net>

authored by

Florian Westphal and committed by
Patrick McHardy
c6675233 9823d9ff

+10 -16
+4 -7
net/ipv4/netfilter/ip_queue.c
··· 314 314 { 315 315 struct nf_queue_entry *entry; 316 316 317 - if (vmsg->value > NF_MAX_VERDICT) 317 + if (vmsg->value > NF_MAX_VERDICT || vmsg->value == NF_STOLEN) 318 318 return -EINVAL; 319 319 320 320 entry = ipq_find_dequeue_entry(vmsg->id); ··· 359 359 break; 360 360 361 361 case IPQM_VERDICT: 362 - if (pmsg->msg.verdict.value > NF_MAX_VERDICT) 363 - status = -EINVAL; 364 - else 365 - status = ipq_set_verdict(&pmsg->msg.verdict, 366 - len - sizeof(*pmsg)); 367 - break; 362 + status = ipq_set_verdict(&pmsg->msg.verdict, 363 + len - sizeof(*pmsg)); 364 + break; 368 365 default: 369 366 status = -EINVAL; 370 367 }
+4 -7
net/ipv6/netfilter/ip6_queue.c
··· 314 314 { 315 315 struct nf_queue_entry *entry; 316 316 317 - if (vmsg->value > NF_MAX_VERDICT) 317 + if (vmsg->value > NF_MAX_VERDICT || vmsg->value == NF_STOLEN) 318 318 return -EINVAL; 319 319 320 320 entry = ipq_find_dequeue_entry(vmsg->id); ··· 359 359 break; 360 360 361 361 case IPQM_VERDICT: 362 - if (pmsg->msg.verdict.value > NF_MAX_VERDICT) 363 - status = -EINVAL; 364 - else 365 - status = ipq_set_verdict(&pmsg->msg.verdict, 366 - len - sizeof(*pmsg)); 367 - break; 362 + status = ipq_set_verdict(&pmsg->msg.verdict, 363 + len - sizeof(*pmsg)); 364 + break; 368 365 default: 369 366 status = -EINVAL; 370 367 }