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=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,T_DKIMWL_WL_HIGH,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 344ECC072B1 for ; Thu, 30 May 2019 04:44:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id F3E5F25AB6 for ; Thu, 30 May 2019 04:44:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559191464; bh=hf+vsL+YZwpSI6oLtJCY9c9z03Kmr2j8vsgQ8N+3tSc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=oA8ksM6jiRSDblu2hpYlGxcr6XU5mXgIleIRYByYj7vxMqMnOS+0IvYcCLfQCQDwk /DAbzuDbyG18KrEjkfLDMyMTmc0F5UNOMRqIYjhGymTfBf2tCctq1pOiiM3IQfsleX 02IM9XmE5LLrOHaU/Dg9sxPA8ZFcRaVTpjU4gIzw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728016AbfE3EoN (ORCPT ); Thu, 30 May 2019 00:44:13 -0400 Received: from mail.kernel.org ([198.145.29.99]:53248 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728169AbfE3DME (ORCPT ); Wed, 29 May 2019 23:12:04 -0400 Received: from localhost (ip67-88-213-2.z213-88-67.customer.algx.net [67.88.213.2]) (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 D62AC24516; Thu, 30 May 2019 03:12:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559185924; bh=hf+vsL+YZwpSI6oLtJCY9c9z03Kmr2j8vsgQ8N+3tSc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cEeluIufYjyRlFA896bTUTBmEQNm0urn+1ZVp+y3OmYgAShsl3pS6rNsteLOBIuJs rI4z9chvX8KVzJKtswrEBnolLIkkOjBQWU4dDOXGasmDMEPPjctDytuPjpDwkmTpro WfjpKKNmbpOGsgCbtJKYswhhjFCwt7z7WSo4Y4vY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Kangjie Lu , Philipp Zabel , Hans Verkuil , Mauro Carvalho Chehab , Sasha Levin Subject: [PATCH 5.1 286/405] media: video-mux: fix null pointer dereferences Date: Wed, 29 May 2019 20:04:44 -0700 Message-Id: <20190530030555.342385321@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190530030540.291644921@linuxfoundation.org> References: <20190530030540.291644921@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org [ Upstream commit aeb0d0f581e2079868e64a2e5ee346d340376eae ] devm_kcalloc may fail and return a null pointer. The fix returns -ENOMEM upon failures to avoid null pointer dereferences. Signed-off-by: Kangjie Lu Reviewed-by: Philipp Zabel Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- drivers/media/platform/video-mux.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/media/platform/video-mux.c b/drivers/media/platform/video-mux.c index 0ba30756e1e40..d8cd5f5cb10d6 100644 --- a/drivers/media/platform/video-mux.c +++ b/drivers/media/platform/video-mux.c @@ -419,9 +419,14 @@ static int video_mux_probe(struct platform_device *pdev) vmux->active = -1; vmux->pads = devm_kcalloc(dev, num_pads, sizeof(*vmux->pads), GFP_KERNEL); + if (!vmux->pads) + return -ENOMEM; + vmux->format_mbus = devm_kcalloc(dev, num_pads, sizeof(*vmux->format_mbus), GFP_KERNEL); + if (!vmux->format_mbus) + return -ENOMEM; for (i = 0; i < num_pads; i++) { vmux->pads[i].flags = (i < num_pads - 1) ? MEDIA_PAD_FL_SINK -- 2.20.1