From patchwork Mon Aug 27 21:14:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Kaehlcke X-Patchwork-Id: 10577599 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 708DD5A4 for ; Mon, 27 Aug 2018 21:15:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5C95B2A011 for ; Mon, 27 Aug 2018 21:15:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4FF9F2A042; Mon, 27 Aug 2018 21:15:06 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2C5F72A011 for ; Mon, 27 Aug 2018 21:15:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727602AbeH1BDW (ORCPT ); Mon, 27 Aug 2018 21:03:22 -0400 Received: from mail-pg1-f193.google.com ([209.85.215.193]:40020 "EHLO mail-pg1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727172AbeH1BDV (ORCPT ); Mon, 27 Aug 2018 21:03:21 -0400 Received: by mail-pg1-f193.google.com with SMTP id z25-v6so153060pgu.7 for ; Mon, 27 Aug 2018 14:15:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=oK18RL5nMDdxorNofXFtMAgaKE7Iu1U3uDnzVrof+e0=; b=QXwCd4Ut2GosyYWwdhvRl/9M4f+jxjyZUvIZ56CDrdyFDZSHXtxBJyn0AKHVfW3xiZ +ZW3FJVHzdmbe62mK2E9x2Runw3U5VLzsLok+pfB19TZFbpu4+oZ28LayYvfVR8nLtjR 3ehg1Man356QdWA5otgoKyH5OeQ0l0noJUyoE= 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:mime-version :content-transfer-encoding; bh=oK18RL5nMDdxorNofXFtMAgaKE7Iu1U3uDnzVrof+e0=; b=OjmecQEZKDwXi2oPJtiwAXNx7AIgw22EJ+sWPEBaLN1dT+/KwhLxrBIMP4N1BSIfLW e1hBGmXXkKuYJ1fHcnBIhL9a3NrUXRJMb1LZ5RxGPI9B62Adk2TrcJGJnAbV1esva4FQ jqD1He3LyZMQgOKNwc+LKawqyN1llY02RZbtj6IVsiTjUYI0Ly+Usdxbd9kHj4Nm8QPa nvQ2/8WJKpEP5MILapUEf1gUQUCp9vHkVyE3mb4rxrfAyfF/nhFiayEHm6G5Y+0XLmxN TodBO326WOW4zgB3kzNn5mNEcJYF6/p3jZR3a2zJHavtnVBUxp5DUnkg+fGZA9fEX1HQ gklw== X-Gm-Message-State: APzg51C5GVtndjRyzrJYVUg6JIMtkcJiZbMGYZinWFGkK11O6tN6msX8 fWy4EQ9g9IWum/lR8KlsZnZc6Q== X-Google-Smtp-Source: ANB0VdYKYNPGrzyuCLp64Y/niVzrlow2jKvBG9OzDVvarL5vcb4ogGAESp1HJ/fkFxXvx6K4uhf+9g== X-Received: by 2002:a63:c50c:: with SMTP id f12-v6mr13904679pgd.113.1535404500894; Mon, 27 Aug 2018 14:15:00 -0700 (PDT) Received: from mka.mtv.corp.google.com ([2620:15c:202:1:b6af:f85:ed6c:ac6a]) by smtp.gmail.com with ESMTPSA id h132-v6sm238699pfc.100.2018.08.27.14.15.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 27 Aug 2018 14:15:00 -0700 (PDT) From: Matthias Kaehlcke To: Jonathan Cameron , Hartmut Knaack , Peter Meerwald-Stadler , Siddartha Mohanadoss Cc: linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org, Douglas Anderson , Matthias Kaehlcke Subject: [PATCH] iio: adc: qcom-spmi-adc5: Verify channel numbers from DT Date: Mon, 27 Aug 2018 14:14:53 -0700 Message-Id: <20180827211453.213061-1-mka@chromium.org> X-Mailer: git-send-email 2.19.0.rc0.228.g281dcd1b4d0-goog MIME-Version: 1.0 Sender: linux-iio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The driver only defines a subset of all possible ADC channels. Channel numbers read from the device tree are accepted as long as they don't exceed a max value, even when no channel definition exists. Add a check to abort initialization in this case. Signed-off-by: Matthias Kaehlcke --- drivers/iio/adc/qcom-spmi-adc5.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/iio/adc/qcom-spmi-adc5.c b/drivers/iio/adc/qcom-spmi-adc5.c index 9c8e6f9e8248..ab5bec917c0a 100644 --- a/drivers/iio/adc/qcom-spmi-adc5.c +++ b/drivers/iio/adc/qcom-spmi-adc5.c @@ -519,7 +519,8 @@ static int adc5_get_dt_channel_data(struct adc5_chip *adc, return ret; } - if (chan > ADC5_PARALLEL_ISENSE_VBAT_IDATA) { + if (chan > ADC5_PARALLEL_ISENSE_VBAT_IDATA || + !data->adc_chans[chan].datasheet_name) { dev_err(dev, "%s invalid channel number %d\n", name, chan); return -EINVAL; }