]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
usb: gadget: eem: fix wrong eem header operation
authorLinyu Yuan <linyyuan@codeaurora.com>
Tue, 8 Jun 2021 23:35:47 +0000 (07:35 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 16 Jun 2021 09:34:53 +0000 (11:34 +0200)
commit 305f670846a31a261462577dd0b967c4fa796871 upstream.

when skb_clone() or skb_copy_expand() fail,
it should pull skb with lengh indicated by header,
or not it will read network data and check it as header.

Cc: <stable@vger.kernel.org>
Signed-off-by: Linyu Yuan <linyyuan@codeaurora.com>
Link: https://lore.kernel.org/r/20210608233547.3767-1-linyyuan@codeaurora.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/gadget/function/f_eem.c

index cad35a502d3f73a64759cd8eb8d541d36104cbac..9411c5f953da8a26ec3b06c01bbc3e8d8a03af75 100644 (file)
@@ -498,7 +498,7 @@ static int eem_unwrap(struct gether *port,
                        skb2 = skb_clone(skb, GFP_ATOMIC);
                        if (unlikely(!skb2)) {
                                DBG(cdev, "unable to unframe EEM packet\n");
-                               continue;
+                               goto next;
                        }
                        skb_trim(skb2, len - ETH_FCS_LEN);
 
@@ -509,7 +509,7 @@ static int eem_unwrap(struct gether *port,
                        if (unlikely(!skb3)) {
                                DBG(cdev, "unable to realign EEM packet\n");
                                dev_kfree_skb_any(skb2);
-                               continue;
+                               goto next;
                        }
                        dev_kfree_skb_any(skb2);
                        skb_queue_tail(list, skb3);