diff options
| author | Mike Pattrick <mkp@redhat.com> | 2022-08-17 11:06:35 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-10-26 13:15:45 +0200 |
| commit | 0c973b81482854e3f5e6329c9dbfff22b36f6404 (patch) | |
| tree | fa42d26a4b79ffc94a4585bcd6e2c81c83fa6edb | |
| parent | 508a9b8a8cca99aa67c9edc097f567763bfc0971 (diff) | |
| download | linux-0c973b81482854e3f5e6329c9dbfff22b36f6404.tar.gz linux-0c973b81482854e3f5e6329c9dbfff22b36f6404.tar.bz2 linux-0c973b81482854e3f5e6329c9dbfff22b36f6404.zip | |
openvswitch: Fix overreporting of drops in dropwatch
[ Upstream commit c21ab2afa2c64896a7f0e3cbc6845ec63dcfad2e ]
Currently queue_userspace_packet will call kfree_skb for all frames,
whether or not an error occurred. This can result in a single dropped
frame being reported as multiple drops in dropwatch. This functions
caller may also call kfree_skb in case of an error. This patch will
consume the skbs instead and allow caller's to use kfree_skb.
Signed-off-by: Mike Pattrick <mkp@redhat.com>
Link: https://bugzilla.redhat.com/show_bug.cgi?id=2109957
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | net/openvswitch/datapath.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/openvswitch/datapath.c b/net/openvswitch/datapath.c index ab318844a19b..10423757e781 100644 --- a/net/openvswitch/datapath.c +++ b/net/openvswitch/datapath.c @@ -555,8 +555,9 @@ static int queue_userspace_packet(struct datapath *dp, struct sk_buff *skb, out: if (err) skb_tx_error(skb); - kfree_skb(user_skb); - kfree_skb(nskb); + consume_skb(user_skb); + consume_skb(nskb); + return err; } |