[<prev] [next>] [day] [month] [year] [list]
Message-Id: <20201201084648.007878659@linuxfoundation.org>
Date: Tue, 1 Dec 2020 09:53:07 +0100
From: Greg Kroah-Hartman <gregkh@...uxfoundation.org>
To: linux-kernel@...r.kernel.org, netdev@...r.kernel.org
Cc: Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
stable@...r.kernel.org, liuzx@...wnsec.com,
Florian Westphal <fw@...len.de>,
Edward Cree <ecree@...arflare.com>,
Cong Wang <cong.wang@...edance.com>
Subject: [PATCH 4.19 02/57] netfilter: clear skb->next in NF_HOOK_LIST()
From: Cong Wang <cong.wang@...edance.com>
NF_HOOK_LIST() uses list_del() to remove skb from the linked list,
however, it is not sufficient as skb->next still points to other
skb. We should just call skb_list_del_init() to clear skb->next,
like the rest places which using skb list.
This has been fixed in upstream by commit ca58fbe06c54
("netfilter: add and use nf_hook_slow_list()").
Fixes: 9f17dbf04ddf ("netfilter: fix use-after-free in NF_HOOK_LIST")
Reported-by: liuzx@...wnsec.com
Tested-by: liuzx@...wnsec.com
Cc: Florian Westphal <fw@...len.de>
Cc: Edward Cree <ecree@...arflare.com>
Cc: stable@...r.kernel.org # between 4.19 and 5.4
Signed-off-by: Cong Wang <cong.wang@...edance.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@...uxfoundation.org>
---
include/linux/netfilter.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/include/linux/netfilter.h
+++ b/include/linux/netfilter.h
@@ -300,7 +300,7 @@ NF_HOOK_LIST(uint8_t pf, unsigned int ho
INIT_LIST_HEAD(&sublist);
list_for_each_entry_safe(skb, next, head, list) {
- list_del(&skb->list);
+ skb_list_del_init(skb);
if (nf_hook(pf, hook, net, sk, skb, in, out, okfn) == 1)
list_add_tail(&skb->list, &sublist);
}
Powered by blists - more mailing lists