From: Felipe Balbi Date: Tue, 29 May 2012 11:36:42 +0000 (+0300) Subject: usb: gadget: omap_udc: remove possiblity of NULL pointer de-reference X-Git-Tag: android-x86-4.4-r1~2643^2~24^2~35^2~33 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=70617db7ad7395498e6bc54c634199bf895426c6;p=android-x86%2Fkernel.git usb: gadget: omap_udc: remove possiblity of NULL pointer de-reference when allocating a request, it's better programming practice to make sure we return NULL if allocation failed. This will ensure that, if struct usb_request isn't the first member on our structure, we don't cheat the gadget driver into thinking allocating worked because pointer isn't 0. Signed-off-by: Felipe Balbi --- diff --git a/drivers/usb/gadget/omap_udc.c b/drivers/usb/gadget/omap_udc.c index 814aafbed000..f13bcdc75676 100644 --- a/drivers/usb/gadget/omap_udc.c +++ b/drivers/usb/gadget/omap_udc.c @@ -268,10 +268,12 @@ omap_alloc_request(struct usb_ep *ep, gfp_t gfp_flags) struct omap_req *req; req = kzalloc(sizeof(*req), gfp_flags); - if (req) { - req->req.dma = DMA_ADDR_INVALID; - INIT_LIST_HEAD(&req->queue); - } + if (!req) + return NULL; + + req->req.dma = DMA_ADDR_INVALID; + INIT_LIST_HEAD(&req->queue); + return &req->req; }