]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
net/sched: act_ct: Fix skb double-free in tcf_ct_handle_fragments() error flow
authorAlaa Hleihel <alaa@mellanox.com>
Wed, 19 Aug 2020 15:24:10 +0000 (18:24 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 27 Aug 2020 07:30:48 +0000 (09:30 +0200)
[ Upstream commit eda814b97dfb8d9f4808eb2f65af9bd3705c4cae ]

tcf_ct_handle_fragments() shouldn't free the skb when ip_defrag() call
fails. Otherwise, we will cause a double-free bug.
In such cases, just return the error to the caller.

Fixes: b57dc7c13ea9 ("net/sched: Introduce action ct")
Signed-off-by: Alaa Hleihel <alaa@mellanox.com>
Reviewed-by: Roi Dayan <roid@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
net/sched/act_ct.c

index 417526d7741bf725bab23f4ce67d1c29158e27cc..16bc5b0d1eaaa30577c0fc8fc3c90936bae49bbd 100644 (file)
@@ -702,7 +702,7 @@ static int tcf_ct_handle_fragments(struct net *net, struct sk_buff *skb,
                err = ip_defrag(net, skb, user);
                local_bh_enable();
                if (err && err != -EINPROGRESS)
-                       goto out_free;
+                       return err;
 
                if (!err) {
                        *defrag = true;