From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752159AbbCTXmM (ORCPT ); Fri, 20 Mar 2015 19:42:12 -0400 Received: from mail-ig0-f174.google.com ([209.85.213.174]:37781 "EHLO mail-ig0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751294AbbCTXmJ (ORCPT ); Fri, 20 Mar 2015 19:42:09 -0400 From: Badhri Jagan Sridharan X-Google-Original-From: Badhri Jagan Sridharan To: Felipe Balbi , Greg Kroah-Hartman Cc: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, Badhri Jagan Sridharan Subject: [PATCH] usb: gadget: Check for NULL pointer in disconnect Date: Fri, 20 Mar 2015 16:40:52 -0700 Message-Id: <1426894852-4256-1-git-send-email-Badhri@google.com> X-Mailer: git-send-email 2.2.0.rc0.207.ga3a616c Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Added a safety net to make sure that composite_disconnect does not end up disconneting a NULL device. Prevents NULL pointer crash. Signed-off-by: Badhri Jagan Sridharan --- drivers/usb/gadget/composite.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c index 13adfd1..90b37bd 100644 --- a/drivers/usb/gadget/composite.c +++ b/drivers/usb/gadget/composite.c @@ -1823,6 +1823,11 @@ void composite_disconnect(struct usb_gadget *gadget) struct usb_composite_dev *cdev = get_gadget_data(gadget); unsigned long flags; + if (!cdev) { + WARN(1, "Trying to disconnect a NULL composite device\n"); + return; + } + /* REVISIT: should we have config and device level * disconnect callbacks? */ -- 2.2.0.rc0.207.ga3a616c