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=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,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 6C2D2C43381 for ; Sat, 9 Mar 2019 07:21:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3271020868 for ; Sat, 9 Mar 2019 07:21:10 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=umn.edu header.i=@umn.edu header.b="WJc4/Z52" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726786AbfCIHVJ (ORCPT ); Sat, 9 Mar 2019 02:21:09 -0500 Received: from mta-p5.oit.umn.edu ([134.84.196.205]:47274 "EHLO mta-p5.oit.umn.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725787AbfCIHVG (ORCPT ); Sat, 9 Mar 2019 02:21:06 -0500 Received: from localhost (unknown [127.0.0.1]) by mta-p5.oit.umn.edu (Postfix) with ESMTP id 496D5CF6 for ; Sat, 9 Mar 2019 07:21:04 +0000 (UTC) X-Virus-Scanned: amavisd-new at umn.edu Received: from mta-p5.oit.umn.edu ([127.0.0.1]) by localhost (mta-p5.oit.umn.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id b08nfG8QmkZw for ; Sat, 9 Mar 2019 01:21:04 -0600 (CST) Received: from mail-it1-f199.google.com (mail-it1-f199.google.com [209.85.166.199]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mta-p5.oit.umn.edu (Postfix) with ESMTPS id 18FEACF0 for ; Sat, 9 Mar 2019 01:21:04 -0600 (CST) Received: by mail-it1-f199.google.com with SMTP id v12so14044639itv.9 for ; Fri, 08 Mar 2019 23:21:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=umn.edu; s=google; h=from:to:cc:subject:date:message-id; bh=pn25Lxb/6HFWwy0AaPTtJqDN7hoQNmgW1nIh0NwMlrA=; b=WJc4/Z52ts81slcOiR7HuUB/iFoHlVovn+GMtW4fio4WCYALTxjhVGHj5jloWBVBCa wZoKn+agJ3DHknM/FR5B5Kp8IXax134osEJhl9BAhOPQ+Tlco/9Mde+8BVND/ekuaFNj 9/T8G6BYCX58F28T/Yp2zxKnrEDhE5b3OM9Fwfx+bAeXGZvoeO3LgnmUibvH1pTkuaAz h+CA/93knAWA6wOgWCDX2boyJBhIKk72P6st8ZzmysrrVYAYw2bwE36tbgh+Qk6NA+Y8 8C7jbKlIZlLtSZwmSxEFHda9vcicldNafSPQY2jd9KdaY1h0BS+WVo71npJRHS575Qbi qNUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=pn25Lxb/6HFWwy0AaPTtJqDN7hoQNmgW1nIh0NwMlrA=; b=GLYUt+URK6A/+J2y8hMukoLiH7g+jYXLnFRYlSofSR+/452nCFCuD0+0vc1MJ902c4 wBk4lwjsp/bBM9dhZSBwqyqwEK4XzU3LrKDtoDfrmYdPDQ46Q9VWc+45BA7cBm7YZlrh ZUlayD2cqZ0XJLxcfdwd0V4LAEf8s1ZEU69rwIhzobErTHvYsbl09TPYZu5+WSuzphpN +Xt+AnjEpJAd9Ye/MtgT/1+nXwfNJQDSHgCzjJ4+w5Blo4AlkmvY/2TBgrA0gCFRnVeH YZpt9ncbZqBQLg0ZOnSHCQe12VhIjFE0m0pCSAueW0rfZ+/lkkbsTtLJm7nrE/n6NS0t RcUA== X-Gm-Message-State: APjAAAWaUqRyMSZai0m/RTxa3AsejNF7wXeagdxX4Bk6daSoU3awIOvB 2lBNfPQ3LXe0t11eFu4SdBjL3Y07mn0cS13OEL+GkbDdvmqle+uwhMcWKRZ1P6SOUizICGbL/OB uBJayv7Uc5LANN0fqIrM+RMBVQXKi X-Received: by 2002:a6b:9189:: with SMTP id t131mr1080264iod.95.1552116063703; Fri, 08 Mar 2019 23:21:03 -0800 (PST) X-Google-Smtp-Source: APXvYqxP2aFGKCA1uQmY4X+NGubgWgOvxg7EmmtiEJTXWQpbqVtb3+Hip+WjQIdfbgKbv+v81ItD+Q== X-Received: by 2002:a6b:9189:: with SMTP id t131mr1080258iod.95.1552116063452; Fri, 08 Mar 2019 23:21:03 -0800 (PST) Received: from bee.dtc.umn.edu (cs-bee-u.cs.umn.edu. [128.101.106.63]) by smtp.gmail.com with ESMTPSA id s11sm4254138ioe.84.2019.03.08.23.21.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 08 Mar 2019 23:21:02 -0800 (PST) From: Kangjie Lu To: kjlu@umn.edu Cc: pakki001@umn.edu, Philipp Zabel , Mauro Carvalho Chehab , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] media: video-mux: fix null pointer dereferences Date: Sat, 9 Mar 2019 01:20:56 -0600 Message-Id: <20190309072056.4618-1-kjlu@umn.edu> X-Mailer: git-send-email 2.17.1 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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 c33900e3c23e..4135165cdabe 100644 --- a/drivers/media/platform/video-mux.c +++ b/drivers/media/platform/video-mux.c @@ -399,9 +399,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.17.1