]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
net: fix __dev_kfree_skb_any() vs drop monitor
authorEric Dumazet <edumazet@google.com>
Thu, 23 Feb 2023 08:38:45 +0000 (08:38 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 11 Mar 2023 15:26:52 +0000 (16:26 +0100)
commit30b26278b4b51a231ccf6cee6d4388b7bab3f617
tree46dc144cd720e2e8facd0c2ec9a9628d512fb1f8
parent8df5f3b50d9ce523251edf9cd0470963be20004b
net: fix __dev_kfree_skb_any() vs drop monitor

[ Upstream commit ac3ad19584b26fae9ac86e4faebe790becc74491 ]

dev_kfree_skb() is aliased to consume_skb().

When a driver is dropping a packet by calling dev_kfree_skb_any()
we should propagate the drop reason instead of pretending
the packet was consumed.

Note: Now we have enum skb_drop_reason we could remove
enum skb_free_reason (for linux-6.4)

v2: added an unlikely(), suggested by Yunsheng Lin.

Fixes: e6247027e517 ("net: introduce dev_consume_skb_any()")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Cc: Yunsheng Lin <linyunsheng@huawei.com>
Reviewed-by: Yunsheng Lin <linyunsheng@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
net/core/dev.c