From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8FE33C43381 for ; Fri, 15 Feb 2019 02:16:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 50F2A20643 for ; Fri, 15 Feb 2019 02:16:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550196961; bh=N+7iE94QtShBEuJOFIUlVhDG9iuMNWhZ1svS+hbpEA8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=MLdJXU+/lTIaoOiaD/5f1zBkDMXVKhhK5ypPn8GGSe8yk+7wzEy7vQTG2lvAc9hOU VJSo8xEfbygKwndSbSDWsxMCsJWH6PjlLthoC+xDRfFCr1BKzh96UX2KLDh99izmV4 xhwYqdTAZSP3y5bb3Xl61df7HWTqi22K/d5HaUuQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2406065AbfBOCP7 (ORCPT ); Thu, 14 Feb 2019 21:15:59 -0500 Received: from mail.kernel.org ([198.145.29.99]:55476 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2406011AbfBOCPz (ORCPT ); Thu, 14 Feb 2019 21:15:55 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 1A4DF20643; Fri, 15 Feb 2019 02:15:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550196954; bh=N+7iE94QtShBEuJOFIUlVhDG9iuMNWhZ1svS+hbpEA8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Du3ca64WEA9gzvw+OOyyqZWyIitihPGcPpWdx/hMS66d6CTwlBz2oj0SCGTuWA5+d NG2UXfQOBaKrX8dx11CbKcpwutkmJlGf//tm7/7pscLIkbgCF/aXTVz0Hc6YS1Gja8 I+LivJjkhcx/XtSXwVcrGD9RSHEH0JF16Ytts9YY= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Dan Carpenter , Felipe Balbi , Sasha Levin , linux-usb@vger.kernel.org Subject: [PATCH AUTOSEL 3.18 05/16] usb: gadget: Potential NULL dereference on allocation error Date: Thu, 14 Feb 2019 21:15:35 -0500 Message-Id: <20190215021546.179605-5-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190215021546.179605-1-sashal@kernel.org> References: <20190215021546.179605-1-sashal@kernel.org> MIME-Version: 1.0 X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Dan Carpenter [ Upstream commit df28169e1538e4a8bcd8b779b043e5aa6524545c ] The source_sink_alloc_func() function is supposed to return error pointers on error. The function is called from usb_get_function() which doesn't check for NULL returns so it would result in an Oops. Of course, in the current kernel, small allocations always succeed so this doesn't affect runtime. Signed-off-by: Dan Carpenter Signed-off-by: Felipe Balbi Signed-off-by: Sasha Levin --- drivers/usb/gadget/function/f_sourcesink.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/usb/gadget/function/f_sourcesink.c b/drivers/usb/gadget/function/f_sourcesink.c index 45b41d1cfd19..ecfd9e71a0d5 100644 --- a/drivers/usb/gadget/function/f_sourcesink.c +++ b/drivers/usb/gadget/function/f_sourcesink.c @@ -1149,7 +1149,7 @@ static struct usb_function *source_sink_alloc_func( ss = kzalloc(sizeof(*ss), GFP_KERNEL); if (!ss) - return NULL; + return ERR_PTR(-ENOMEM); ss_opts = container_of(fi, struct f_ss_opts, func_inst); -- 2.19.1