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.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 DF2B5C43381 for ; Fri, 22 Mar 2019 13:15:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A412D2183E for ; Fri, 22 Mar 2019 13:15:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553260500; bh=Uk1QjX++JvwS7HGJbKnuNR1/Y8X4u8/jbgSGbYvpoII=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=TEF2+kesTOtf+d5d4SMYv7G1s7uxU1qR3kd+lfbxqe+ivcxHi4XRin7GhMixaCrlO qJxmHYmg8hCH7KL0Z9I1mCB0JuRgn+q4k/BnPFmUyWDKiUXXfyHzgO/SFqYTnYhOCd kUt76UAD4Bv/axFDMX+202VhhWHI2pSPFua+UfXA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729249AbfCVNO7 (ORCPT ); Fri, 22 Mar 2019 09:14:59 -0400 Received: from mail.kernel.org ([198.145.29.99]:56426 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729697AbfCVL2h (ORCPT ); Fri, 22 Mar 2019 07:28:37 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 920CC218B0; Fri, 22 Mar 2019 11:28:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553254117; bh=Uk1QjX++JvwS7HGJbKnuNR1/Y8X4u8/jbgSGbYvpoII=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bwVz2Ti4L+waYptrQhrHpYONdPbAg0ZJRnxat+BGVoJdw+rKasRaAvFh6EUB3O421 rqY+YLzqiCDl9uvRTiwfRfQ0dlApjknbUhagSDG9chD1JakUjLNvD5w8RoRuR7RxdS d0kDsPdYcX2denLo7Ifik1Y9O5Hn+aJ8URdlAbYo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dan Carpenter , Felipe Balbi , Sasha Levin Subject: [PATCH 4.4 037/230] usb: gadget: Potential NULL dereference on allocation error Date: Fri, 22 Mar 2019 12:12:55 +0100 Message-Id: <20190322111239.300107737@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190322111236.796964179@linuxfoundation.org> References: <20190322111236.796964179@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.4-stable review patch. If anyone has any objections, please let me know. ------------------ [ 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 67b2439899389..d7d095781be18 100644 --- a/drivers/usb/gadget/function/f_sourcesink.c +++ b/drivers/usb/gadget/function/f_sourcesink.c @@ -849,7 +849,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