Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp4747500imu; Sat, 1 Dec 2018 02:06:11 -0800 (PST) X-Google-Smtp-Source: AFSGD/UtzdPX2DcYAT24ysJXVb64d9OLmSXkSJKmXEb1fgTEAhaBuSSlYqOgU3zdq6AbZdVLeOZD X-Received: by 2002:a63:cb4a:: with SMTP id m10mr7153132pgi.105.1543658771517; Sat, 01 Dec 2018 02:06:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1543658771; cv=none; d=google.com; s=arc-20160816; b=n5mNIoIbe1QvEdx4xv/PevgcQaB4ZilQ9ePB0y9L8DgHv5d17shoi1H6OyjQUKucy2 s9YXyPNBukH2nsOZQMmh5vhDeZcmiru/oTJTFAW3x+doOW9VQAr5/5ktLHytMzG9ogFg KURpBvgnAY4HeasCA14dn69ATzoqxEfvXRQ4iGjDnE9WQoJeYw3JZIOpST677PCoHiME 3SehjEv1zulcIQW6C9KE68gNEfyhUOnvRO+f9L8MfCTxSRtdLsKkMkH7+Bqub8tWaKIh KZ9dCm+D/0aR9DQ29wKHce/Pnszdtv+9ywGTflcKpq+9yTgz40eiScq6RDXmPz2z4iJF Cryg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from; bh=7UHpyImohLWKrxO7Yx39WLN7K7Ux66s7kiB1cr4hofA=; b=oKWqdrQ2cAmUPGywIRAgkysanJfrPEIc5PHLmqkOk/PPmIvTlldm6mZefTIWMwVaKb 0hzfOJ0x+KTwl2ApyhjKzflsCMmw/lZgkygjTjex9jtNU+EZUdsDOa1e5xa0KjMrg8xG YKhFg/i2zy1oDK9VJ20ToPGp3McbHJ6KVUEVOU9zgOtRbp2f4g8gh2Ew8DaVzXiQWjPF sY2u9DPEfL0Y8ld604nUiLCZRWLt8NWQ6FcBQDrSM/4N7yCdtNIprwVgZypFSoUOPAAv z9MaZrMUY05SpYZNZeSij7wqHeLAvfVKVf//TvRypGiVRBEWiZsxi0ClONb1EgueUZwE xypg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id g32si7366973pgg.400.2018.12.01.02.05.55; Sat, 01 Dec 2018 02:06:11 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726602AbeLAVR3 (ORCPT + 99 others); Sat, 1 Dec 2018 16:17:29 -0500 Received: from www.osadl.org ([62.245.132.105]:50802 "EHLO www.osadl.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726342AbeLAVR3 (ORCPT ); Sat, 1 Dec 2018 16:17:29 -0500 Received: from debian01.hofrr.at (178.115.242.59.static.drei.at [178.115.242.59]) by www.osadl.org (8.13.8/8.13.8/OSADL-2007092901) with ESMTP id wB1A49Qa015563; Sat, 1 Dec 2018 11:04:09 +0100 From: Nicholas Mc Guire To: Wolfram Sang Cc: Peter Rosin , linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org, Nicholas Mc Guire Subject: [PATCH] i2c: mux: demux-pinctrl: handle failure case of devm_kstrdup() Date: Sat, 1 Dec 2018 11:01:10 +0100 Message-Id: <1543658470-20887-1-git-send-email-hofrat@osadl.org> X-Mailer: git-send-email 2.1.4 X-Spam-Status: No, score=-1.9 required=6.0 tests=BAYES_00 autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on www.osadl.org Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org devm_kstrdup() may return NULL if internal allocation failed. Thus using name, value is unsafe without being checked. As i2c_demux_pinctrl_probe() can return -ENOMEM in other cases a dev_err() message is included to make the failure location clear. Signed-off-by: Nicholas Mc Guire Fixes: e35478eac030 ("i2c: mux: demux-pinctrl: run properly with multiple instances") --- Problem located with experimental coccinelle script Q: The use of devm_kstrdup() seems a bit odd while technically not wrong, personally I think devm_kasprintf() would be more suitable here. Patch was compile tested with: multi_v7_defconfig (implies I2C_DEMUX_PINCTRL=y) Patch is against 4.20-rc4 (localversion-next is next-20181130) drivers/i2c/muxes/i2c-demux-pinctrl.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/i2c/muxes/i2c-demux-pinctrl.c b/drivers/i2c/muxes/i2c-demux-pinctrl.c index 035032e..c466999 100644 --- a/drivers/i2c/muxes/i2c-demux-pinctrl.c +++ b/drivers/i2c/muxes/i2c-demux-pinctrl.c @@ -244,6 +244,12 @@ static int i2c_demux_pinctrl_probe(struct platform_device *pdev) props[i].name = devm_kstrdup(&pdev->dev, "status", GFP_KERNEL); props[i].value = devm_kstrdup(&pdev->dev, "ok", GFP_KERNEL); + if (!props[i].name || !props[i].value) { + dev_err(&pdev->dev, + "chan %d name, value allocation failed\n", i); + err = -ENOMEM; + goto err_rollback; + } props[i].length = 3; of_changeset_init(&priv->chan[i].chgset); -- 2.1.4