From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AH8x227X0w6msUGz8km2os8V50Gnrx+hjtFEp0olfQy2VU8L1vvB63OU61ouXOyUZdli4bl039HE ARC-Seal: i=1; a=rsa-sha256; t=1517256504; cv=none; d=google.com; s=arc-20160816; b=Syi3RflC+IINN2wFe/rwPo7ZSNEQaUd1x04i31E2N3kirl2bDl8iU57SqSDDfFoNVA IucGb8Tl3bxxSXmOgmLycMdJIPwFKQyJHYRu+CrY/UBMlMIN3hnoBmoQARDu50BSwVWa WqHZw48Iqdg0VpSMZiFZ+JuOacyS7u6tgT3fjleyt74ErN0bFs8ukiX/UpIGMMhzk6yq XxMhfZNU2mw/QlOABz7R/f1PWuO+iMrUi2TQdc1xxjXj6nZvzUDcOOrxcbxWW44KKRH2 aZPi3HQmhCnYPmqQHPQU22v5goYBMYDdS3PBQ+Ul2Z3j43si+e+DEH+ZtRJmxGToXsFj o4uQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:user-agent:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=Blvs29GAcRVlrlmV58QrVu6FieBl1Ns5SYocjS9PDRI=; b=p4Owf68BXmqwx+CdWN7p34C04cz8oBZsV4IBcyvdeD0xmRBYuAbzGkQGnGgoRiOVOL bSNtuFrwaiWev9c25UBmL1EvUsb6ENaEjd9P8BSyfGd6v/Sm/sLkrB5kVzuqYySXHAh7 BU/QRFgcucmzJsPIus4bPIz30zLIXfqpW6Iwwqv9ZPLrhQEhaHnbHZczA+amdQwQiHbx vZRKpiu8yopy3o+biy951AYJTujsw4sweDpdiVT7bTFasJkx1f8cSdxCaKZ6gbboLdqR 5/EUnsxvIBvJUqBKgdbBIGTSgy6m260QCskq2ocQh5kROH/CQKCqUmbJTqjRFaxwHi+P 6/SA== ARC-Authentication-Results: i=1; mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.71.90 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org Authentication-Results: mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.71.90 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Liping Zhang , Florian Westphal , Pablo Neira Ayuso , Michal Kubecek Subject: [PATCH 4.4 34/74] netfilter: nfnetlink_queue: reject verdict request from different portid Date: Mon, 29 Jan 2018 13:56:39 +0100 Message-Id: <20180129123849.125503078@linuxfoundation.org> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180129123847.507563674@linuxfoundation.org> References: <20180129123847.507563674@linuxfoundation.org> User-Agent: quilt/0.65 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-LABELS: =?utf-8?b?IlxcU2VudCI=?= X-GMAIL-THRID: =?utf-8?q?1590958755776668400?= X-GMAIL-MSGID: =?utf-8?q?1590958755776668400?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 4.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Liping Zhang commit 00a3101f561816e58de054a470484996f78eb5eb upstream. Like NFQNL_MSG_VERDICT_BATCH do, we should also reject the verdict request when the portid is not same with the initial portid(maybe from another process). Fixes: 97d32cf9440d ("netfilter: nfnetlink_queue: batch verdict support") Signed-off-by: Liping Zhang Reviewed-by: Florian Westphal Signed-off-by: Pablo Neira Ayuso Acked-by: Michal Kubecek Signed-off-by: Greg Kroah-Hartman --- net/netfilter/nfnetlink_queue.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) --- a/net/netfilter/nfnetlink_queue.c +++ b/net/netfilter/nfnetlink_queue.c @@ -1053,10 +1053,8 @@ nfqnl_recv_verdict(struct sock *ctnl, st struct net *net = sock_net(ctnl); struct nfnl_queue_net *q = nfnl_queue_pernet(net); - queue = instance_lookup(q, queue_num); - if (!queue) - queue = verdict_instance_lookup(q, queue_num, - NETLINK_CB(skb).portid); + queue = verdict_instance_lookup(q, queue_num, + NETLINK_CB(skb).portid); if (IS_ERR(queue)) return PTR_ERR(queue);