* [PATCH] usb: gadget: prevent potenial null pointer dereference on skb->len
@ 2016-09-05 15:37 Colin King
2016-09-06 1:44 ` Peter Chen
0 siblings, 1 reply; 2+ messages in thread
From: Colin King @ 2016-09-05 15:37 UTC (permalink / raw)
To: Felipe Balbi, Greg Kroah-Hartman, Peter Chen,
Andrzej Pietrasiewicz, Nicholas Bellinger, Robert Baldyga,
John Youn, linux-usb
Cc: linux-kernel
From: Colin Ian King <colin.king@canonical.com>
An earlier fix partially fixed the null pointer dereference on skb->len
by moving the assignment of len after the check on skb being non-null,
however it failed to remove the erroneous dereference when assigning len.
Correctly fix this by removing the initialisation of len as was
originally intended.
Fixes: 70237dc8efd092 ("usb: gadget: function: f_eem: socket buffer may be NULL")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
drivers/usb/gadget/function/f_eem.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/usb/gadget/function/f_eem.c b/drivers/usb/gadget/function/f_eem.c
index 8741fd7..007ec6e 100644
--- a/drivers/usb/gadget/function/f_eem.c
+++ b/drivers/usb/gadget/function/f_eem.c
@@ -342,7 +342,7 @@ static struct sk_buff *eem_wrap(struct gether *port, struct sk_buff *skb)
struct sk_buff *skb2 = NULL;
struct usb_ep *in = port->in_ep;
int headroom, tailroom, padlen = 0;
- u16 len = skb->len;
+ u16 len;
if (!skb)
return NULL;
--
2.9.3
^ permalink raw reply related [flat|nested] 2+ messages in thread
* RE: [PATCH] usb: gadget: prevent potenial null pointer dereference on skb->len
2016-09-05 15:37 [PATCH] usb: gadget: prevent potenial null pointer dereference on skb->len Colin King
@ 2016-09-06 1:44 ` Peter Chen
0 siblings, 0 replies; 2+ messages in thread
From: Peter Chen @ 2016-09-06 1:44 UTC (permalink / raw)
To: Colin King, Felipe Balbi, Greg Kroah-Hartman,
Andrzej Pietrasiewicz, Nicholas Bellinger, Robert Baldyga,
John Youn, linux-usb
Cc: linux-kernel
>
>From: Colin Ian King <colin.king@canonical.com>
>
>An earlier fix partially fixed the null pointer dereference on skb->len by moving the
>assignment of len after the check on skb being non-null, however it failed to remove
>the erroneous dereference when assigning len.
>Correctly fix this by removing the initialisation of len as was originally intended.
>
>Fixes: 70237dc8efd092 ("usb: gadget: function: f_eem: socket buffer may be NULL")
>Signed-off-by: Colin Ian King <colin.king@canonical.com>
>---
> drivers/usb/gadget/function/f_eem.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/drivers/usb/gadget/function/f_eem.c b/drivers/usb/gadget/function/f_eem.c
>index 8741fd7..007ec6e 100644
>--- a/drivers/usb/gadget/function/f_eem.c
>+++ b/drivers/usb/gadget/function/f_eem.c
>@@ -342,7 +342,7 @@ static struct sk_buff *eem_wrap(struct gether *port, struct
>sk_buff *skb)
> struct sk_buff *skb2 = NULL;
> struct usb_ep *in = port->in_ep;
> int headroom, tailroom, padlen = 0;
>- u16 len = skb->len;
>+ u16 len;
>
> if (!skb)
> return NULL;
Sorry, my careless, Thanks for fixing it.
Acked-by: Peter Chen <peter.chen@nxp.com>
Peter
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-09-06 2:00 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-09-05 15:37 [PATCH] usb: gadget: prevent potenial null pointer dereference on skb->len Colin King
2016-09-06 1:44 ` Peter Chen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).