Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp5539012imu; Mon, 26 Nov 2018 01:46:50 -0800 (PST) X-Google-Smtp-Source: AFSGD/VY0OkqB7aP62+JlfFe1rHfUrkAY+We5+klu3Yu1OAg1Sezx0adeaAx/47yS7fzJ6Ayi1F9 X-Received: by 2002:a63:fd0a:: with SMTP id d10mr24542182pgh.164.1543225610207; Mon, 26 Nov 2018 01:46:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1543225610; cv=none; d=google.com; s=arc-20160816; b=s5lL+BkV/A00SzhkI67ExyAi/lu8NDq29qsGeSPgCFcJ1oKzsKdCIakzEdHT95eVjj uV//Ohbh1qV6bYllX/mtybh2ebTGhFYJFMS1W3uYgDFWmNOhTBM+7alpuuZect7l7ENP WKsGZRYiwIqviGIlbBSes5kn6YNUXjwhu1sQx/4EgpwYLKdPpshf0Vsbnf9XXcR2Pcxg 7cK4wXIZgYGtEdG/gpwKRzsBAoPKeLbTapCCCehcu1ozP+3E9Jz+WcE16cwVRFjHTRji wTsaWJhsDqU9YbJL/VFhz78+/6tUFdHvsY2t9a9D4Xc5iFy9gwRuvQl6ac/dUaRqiLST R2Vw== 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=exMuxVm5xqpZpBhbjFoxfisO85mfMPT8P2R2befACRk=; b=MD06gcsBrbQ+YELTrh6P93NuyoAiaij9D8OL/77QNBC8PLUWcoywB/ZfU/zi4UC32O Zzp8wfgl6BCTvTj1fRFCnJH1qES3GOfpmD75o54ir3m665y7tlkpfULah63BlhC9TATo ToI7kORU/6x7JZXrKAiJKWEuka+V3Z/MizVSuKqjzVfyKfhcbR3PGffC4jr8Ji+nWfco hAaFLFUwwF79lrjB4j7lF7XXXJtmLDe6XH8oL6yoYkmMlh3T9tyP5WuAReqDyALRPYrG vGX7dbDujeFKN1mtv9Myh8JAJZLlUM7fYyuwROE7Kchp1qUDo7nMNPfhZ+c+fOz8SQUz IOJg== 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 n10-v6si49237400plk.255.2018.11.26.01.46.34; Mon, 26 Nov 2018 01:46:50 -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 S1726312AbeKZUiL (ORCPT + 99 others); Mon, 26 Nov 2018 15:38:11 -0500 Received: from www.osadl.org ([62.245.132.105]:51445 "EHLO www.osadl.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726184AbeKZUiL (ORCPT ); Mon, 26 Nov 2018 15:38:11 -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 wAQ9g1B1010454; Mon, 26 Nov 2018 10:42:01 +0100 From: Nicholas Mc Guire To: Lars-Peter Clausen Cc: Michael Hennerich , Jonathan Cameron , Hartmut Knaack , Peter Meerwald-Stadler , Greg Kroah-Hartman , linux-iio@vger.kernel.org, devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org, Nicholas Mc Guire Subject: [PATCH] staging: iio: adc: ad7280a: check for devm_kasprint() failure Date: Mon, 26 Nov 2018 10:39:04 +0100 Message-Id: <1543225144-27468-1-git-send-email-hofrat@osadl.org> X-Mailer: git-send-email 2.1.4 X-Spam-Status: No, score=-4.2 required=6.0 tests=BAYES_00,RCVD_IN_DNSWL_MED 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_kasprintf() may return NULL on failure of internal allocation thus the assignments to attr.name are not safe if not checked. On error ad7280_attr_init() returns a negative return so -ENOMEM should be OK here (passed on as return value of the probe function). Signed-off-by: Nicholas Mc Guire Fixes: 2051f25d2a26 ("iio: adc: New driver for AD7280A Lithium Ion Battery Monitoring System2") --- Problem located with an experimental coccinelle script As using if(!st->iio_attr[cnt].dev_attr.attr.name) seamed quite unreadable in this case the (var == NULL) variant was used. Not sure if there are objections against this (checkpatch.pl issues a CHECK on this). Patch was compile tested with: x86_64_defconfig + STAGING=y SPI=y, IIO=y, AD7280=m Patch is against 4.20-rc4 (localversion-next is next-20181126) drivers/staging/iio/adc/ad7280a.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/staging/iio/adc/ad7280a.c b/drivers/staging/iio/adc/ad7280a.c index 0bb9ab1..5b87530 100644 --- a/drivers/staging/iio/adc/ad7280a.c +++ b/drivers/staging/iio/adc/ad7280a.c @@ -584,6 +584,9 @@ static int ad7280_attr_init(struct ad7280_state *st) devm_kasprintf(&st->spi->dev, GFP_KERNEL, "in%d-in%d_balance_switch_en", index, index + 1); + if (st->iio_attr[cnt].dev_attr.attr.name == NULL) + return -ENOMEM; + ad7280_attributes[cnt] = &st->iio_attr[cnt].dev_attr.attr; cnt++; @@ -600,6 +603,9 @@ static int ad7280_attr_init(struct ad7280_state *st) devm_kasprintf(&st->spi->dev, GFP_KERNEL, "in%d-in%d_balance_timer", index, index + 1); + if (st->iio_attr[cnt].dev_attr.attr.name == NULL) + return -ENOMEM; + ad7280_attributes[cnt] = &st->iio_attr[cnt].dev_attr.attr; } -- 2.1.4