From patchwork Mon May 31 13:12:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 450495 Delivered-To: patch@linaro.org Received: by 2002:a02:c735:0:0:0:0:0 with SMTP id h21csp849329jao; Mon, 31 May 2021 06:52:23 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxELb67sVgJNOvBzFot4qQev04MkBrNScyKilqiJN1W13615rS/QkPh9nldoJbd02Qr1H/0 X-Received: by 2002:a05:6e02:1be8:: with SMTP id y8mr17531002ilv.52.1622469143537; Mon, 31 May 2021 06:52:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1622469143; cv=none; d=google.com; s=arc-20160816; b=Pd0zskHJYHRUs5ZxhXpfaw5DR1kzT+7t6beZPRd+nANrhCXFI7lNB+IBaXgrDqn8AI UNlAwV6Q7D+CxWVDK4RUQLOE3qDl+aipcNvEXyWR/zwU5PsL4qCbRVPjvL9YXP5KBWUq 9KG6YHTwODwT42iRGmdtM8KS8xR0M/S1SrWb8dwbWk58X1sNclKspPRfF8kZRKu52kA2 ufWhC37eiEOlrD8DjhWmRPxiuCLv0SeAGlMee4G+f3nADATSGBpJ7edC5MS5Az8kvtw3 r1Ch56c2M6dp0+WWkgdvSH2RB2jPR4VJBhuTzwEIP8VbFOvbkFsJ40hWkREY5pcTe+z8 ugpA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=deyEw6ZO+idsFQvhGiFL0SYfrRvvHofJsytmTovNrXo=; b=V6YWOMoYpqjSOfkzbel54MWaSMDejPzumt0/uvlSOBgCp4B7JBpOFQmmpfQLYHGnRG PcmHTIVuVwNYA0Dqcvxxdabz40tcKWfNuruXv+PYOD6dCDhK1U1pUQJh8OQJwYRr2rw+ Qi5UcnBHgGPR9O7yAXZgWFv+0YNuNbljBSpvLKZav0AAo+SxiqLvj4A0AUPllko3Ewv5 b/5sVlTHbc+OcLdlq/d+H2oCUq9BLr603BF6KU9MCL/OTE74i0e7RBraMc/bvfNPreAM jGXhLBiuMHoGj37GWMrgTEcMokurlv1k1QWo5VBSau7iT6rb4+vN1gOgOJGePfs3fGWv FIjA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=JClpubnk; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id y3si13612759jat.97.2021.05.31.06.52.22; Mon, 31 May 2021 06:52:23 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=JClpubnk; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233054AbhEaNyA (ORCPT + 12 others); Mon, 31 May 2021 09:54:00 -0400 Received: from mail.kernel.org ([198.145.29.99]:55412 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232540AbhEaNvv (ORCPT ); Mon, 31 May 2021 09:51:51 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id E3A5C616E9; Mon, 31 May 2021 13:32:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1622467962; bh=Xdmu0No1qD89vu5RbDro4R5XL0d4XQoB0rtetHFaD4I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JClpubnkwpZu9a8XdEDS/Dk+cQBcP1l3HiVHtFKrRnnh+qARk7mt75GqHbrgXSIvB HwNfWrlZfYblMuU0mEexuTJt7W1P/68wIZ/j/B+HodSiPZsAo9eyn1ryCWp90pKMWG WTgfbi4QrYHjoVSunX6pil09VRCpWvbY6///nF7s= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Alexandru Ardelean , Jonathan Cameron , Alexandru Ardelean , Stable@vger.kernel.org Subject: [PATCH 5.10 065/252] iio: adc: ad7124: Fix potential overflow due to non sequential channel numbers Date: Mon, 31 May 2021 15:12:10 +0200 Message-Id: <20210531130700.196502617@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210531130657.971257589@linuxfoundation.org> References: <20210531130657.971257589@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Jonathan Cameron commit f2a772c51206b0c3f262e4f6a3812c89a650191b upstream. Channel numbering must start at 0 and then not have any holes, or it is possible to overflow the available storage. Note this bug was introduced as part of a fix to ensure we didn't rely on the ordering of child nodes. So we need to support arbitrary ordering but they all need to be there somewhere. Note I hit this when using qemu to test the rest of this series. Arguably this isn't the best fix, but it is probably the most minimal option for backporting etc. Alexandru's sign-off is here because he carried this patch in a larger set that Jonathan then applied. Fixes: d7857e4ee1ba6 ("iio: adc: ad7124: Fix DT channel configuration") Reviewed-by: Alexandru Ardelean Signed-off-by: Jonathan Cameron Signed-off-by: Alexandru Ardelean Cc: Signed-off-by: Greg Kroah-Hartman --- drivers/iio/adc/ad7124.c | 7 +++++++ 1 file changed, 7 insertions(+) --- a/drivers/iio/adc/ad7124.c +++ b/drivers/iio/adc/ad7124.c @@ -616,6 +616,13 @@ static int ad7124_of_parse_channel_confi if (ret) goto err; + if (channel >= indio_dev->num_channels) { + dev_err(indio_dev->dev.parent, + "Channel index >= number of channels\n"); + ret = -EINVAL; + goto err; + } + ret = of_property_read_u32_array(child, "diff-channels", ain, 2); if (ret)