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

netfilter: nfnetlink: fix warn in nfnetlink_unbind

syzbot reports following warn:
WARNING: CPU: 0 PID: 3600 at net/netfilter/nfnetlink.c:703 nfnetlink_unbind+0x357/0x3b0 net/netfilter/nfnetlink.c:694

The syzbot generated program does this:

socket(AF_NETLINK, SOCK_RAW, NETLINK_NETFILTER) = 3
setsockopt(3, SOL_NETLINK, NETLINK_DROP_MEMBERSHIP, [1], 4) = 0

... which triggers 'WARN_ON_ONCE(nfnlnet->ctnetlink_listeners == 0)' check.

Instead of counting, just enable reporting for every bind request
and check if we still have listeners on unbind.

While at it, also add the needed bounds check on nfnl_group2type[]
access.

Reported-by: <syzbot+4903218f7fba0a2d6226@syzkaller.appspotmail.com>
Reported-by: <syzbot+afd2d80e495f96049571@syzkaller.appspotmail.com>
Fixes: 2794cdb0b97b ("netfilter: nfnetlink: allow to detect if ctnetlink listeners exist")
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

authored by

Florian Westphal and committed by
Pablo Neira Ayuso
ffd219ef 02ded5a1

+5 -19
+5 -19
net/netfilter/nfnetlink.c
··· 45 45 static unsigned int nfnetlink_pernet_id __read_mostly; 46 46 47 47 struct nfnl_net { 48 - unsigned int ctnetlink_listeners; 49 48 struct sock *nfnl; 50 49 }; 51 50 ··· 672 673 673 674 #ifdef CONFIG_NF_CONNTRACK_EVENTS 674 675 if (type == NFNL_SUBSYS_CTNETLINK) { 675 - struct nfnl_net *nfnlnet = nfnl_pernet(net); 676 - 677 676 nfnl_lock(NFNL_SUBSYS_CTNETLINK); 678 - 679 - if (WARN_ON_ONCE(nfnlnet->ctnetlink_listeners == UINT_MAX)) { 680 - nfnl_unlock(NFNL_SUBSYS_CTNETLINK); 681 - return -EOVERFLOW; 682 - } 683 - 684 - nfnlnet->ctnetlink_listeners++; 685 - if (nfnlnet->ctnetlink_listeners == 1) 686 - WRITE_ONCE(net->ct.ctnetlink_has_listener, true); 677 + WRITE_ONCE(net->ct.ctnetlink_has_listener, true); 687 678 nfnl_unlock(NFNL_SUBSYS_CTNETLINK); 688 679 } 689 680 #endif ··· 683 694 static void nfnetlink_unbind(struct net *net, int group) 684 695 { 685 696 #ifdef CONFIG_NF_CONNTRACK_EVENTS 686 - int type = nfnl_group2type[group]; 697 + if (group <= NFNLGRP_NONE || group > NFNLGRP_MAX) 698 + return; 687 699 688 - if (type == NFNL_SUBSYS_CTNETLINK) { 689 - struct nfnl_net *nfnlnet = nfnl_pernet(net); 690 - 700 + if (nfnl_group2type[group] == NFNL_SUBSYS_CTNETLINK) { 691 701 nfnl_lock(NFNL_SUBSYS_CTNETLINK); 692 - WARN_ON_ONCE(nfnlnet->ctnetlink_listeners == 0); 693 - nfnlnet->ctnetlink_listeners--; 694 - if (nfnlnet->ctnetlink_listeners == 0) 702 + if (!nfnetlink_has_listeners(net, group)) 695 703 WRITE_ONCE(net->ct.ctnetlink_has_listener, false); 696 704 nfnl_unlock(NFNL_SUBSYS_CTNETLINK); 697 705 }