Skip to content

Commit 70237dc

Browse files
Peter ChenFelipe Balbi
authored andcommitted
usb: gadget: function: f_eem: socket buffer may be NULL
In eth_start_xmit, the socket buffer may be NULL. So, add NULL pointer check at .wrap API. Signed-off-by: Peter Chen <[email protected]> Signed-off-by: Felipe Balbi <[email protected]>
1 parent 3295235 commit 70237dc

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

drivers/usb/gadget/function/f_eem.c

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -341,11 +341,15 @@ static struct sk_buff *eem_wrap(struct gether *port, struct sk_buff *skb)
341341
{
342342
struct sk_buff *skb2 = NULL;
343343
struct usb_ep *in = port->in_ep;
344-
int padlen = 0;
344+
int headroom, tailroom, padlen = 0;
345345
u16 len = skb->len;
346346

347-
int headroom = skb_headroom(skb);
348-
int tailroom = skb_tailroom(skb);
347+
if (!skb)
348+
return NULL;
349+
350+
len = skb->len;
351+
headroom = skb_headroom(skb);
352+
tailroom = skb_tailroom(skb);
349353

350354
/* When (len + EEM_HLEN + ETH_FCS_LEN) % in->maxpacket) is 0,
351355
* stick two bytes of zero-length EEM packet on the end.

0 commit comments

Comments
 (0)