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,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 7B4D7C43381 for ; Fri, 15 Feb 2019 02:42:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 485632192B for ; Fri, 15 Feb 2019 02:42:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550198541; bh=DPzk3bfpQ4QxcFB5vcNaOzyaV40b44hCAKC+He+PL/Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Dkgc3V4cdCUJsuY2rznq0j4MgSJDeS2iUrg6+Z/8dqPrqhd7k3T5l5c9TsIoPFtQj Q0JFP3KbGXwlsAa0EMARFd27M6vyX6v5SvAysXiayIwcs8RmwTNbNUEsmnLbwnB3DX TtfzHqeVPfNpDZs1YtPl8NxJufGzWYfY+AFV8DM8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731168AbfBOCJ0 (ORCPT ); Thu, 14 Feb 2019 21:09:26 -0500 Received: from mail.kernel.org ([198.145.29.99]:49516 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731685AbfBOCJS (ORCPT ); Thu, 14 Feb 2019 21:09:18 -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 5E5CD206BA; Fri, 15 Feb 2019 02:09:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550196558; bh=DPzk3bfpQ4QxcFB5vcNaOzyaV40b44hCAKC+He+PL/Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LEV3TiiawIyBfAJivKGGDVjqDw+ppb40XSHbmpSNuqslb+vrxIqzUJmrMuShzlaaH 4qDFa3/jiXz0EJYtBLp7kqRe5ngjdMe7GqScl12p2F8lLwLc07n9raKbrFdMwrKeGS PEmI1KBSXPE5t8yqp0Ncp1nGsXCzYOktzZkj2Y/g= 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 4.20 14/77] usb: gadget: Potential NULL dereference on allocation error Date: Thu, 14 Feb 2019 21:07:52 -0500 Message-Id: <20190215020855.176727-14-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190215020855.176727-1-sashal@kernel.org> References: <20190215020855.176727-1-sashal@kernel.org> MIME-Version: 1.0 X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@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 9cdef108fb1b..ed68a4860b7d 100644 --- a/drivers/usb/gadget/function/f_sourcesink.c +++ b/drivers/usb/gadget/function/f_sourcesink.c @@ -838,7 +838,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