Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e76cb5c8 authored by Linyu Yuan's avatar Linyu Yuan Committed by Greg Kroah-Hartman
Browse files

usb: gadget: eem: fix wrong eem header operation 



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: default avatarLinyu Yuan <linyyuan@codeaurora.com>
Link: https://lore.kernel.org/r/20210608233547.3767-1-linyyuan@codeaurora.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent af9950fa

drivers/usb/gadget/function/f_eem.c

+2 −2
Original line number Diff line number Diff line
@@ -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);
@@ -508,7 +508,7 @@ static int eem_unwrap(struct gether *port, 
						GFP_ATOMIC);

			if (unlikely(!skb3)) {

				dev_kfree_skb_any(skb2);

				continue;

				goto next;

			}

			dev_kfree_skb_any(skb2);

			skb_queue_tail(list, skb3);