From patchwork Mon Jul 20 15:35:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 237539 Delivered-To: patch@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp2123934ilg; Mon, 20 Jul 2020 09:20:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwm+eNVyZ12uMGoNmxvyMD0N41zy/PFH7LBaMAXgUQ05qkSSOSXDUmwwmZOZ7ebCyugQ0Qs X-Received: by 2002:a50:fa07:: with SMTP id b7mr21579764edq.298.1595262024925; Mon, 20 Jul 2020 09:20:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1595262024; cv=none; d=google.com; s=arc-20160816; b=LOMZqnmmf7cJNG9C2xnJwTdg0R3Y3v53lxKCGbnu2NczO7hBL+65iXWmDuKg0hIu/k SrhvWvjCEZuAMlS1XRZSgXgp8EXe3G5Wt5MtcbVwpOqTZm1bSQWr835omUy74VNoX9O2 4xIs6TVNMvJSJEo6jKbU+XBWfHHx3NV9pfKu5Pw5DXYhm6GEfI4//3iCRm44sGd7s0aH eBUXlBHxLC7b2LEu5eugg+/wrcIZ2cJGl9f1wFfUx1vpqwXpy8fZuFn5gJbi7E6fe1JF xv+p1VhjCaATS3vVTGu6e47UHe/dTXqWPyuGuT45oaLJcaSKPuaWjDq+WszaTOWcOp3c egGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=bg1QsSJ+1PnVYtnO+4KbjyPf/NMpr4oRz1r6haFyT7M=; b=iB04ndtqr4SMY6eZ2VRSChfYSrlVtfK0HY+C1ewF0XwCwnOz7+9DgnDtSgC3xVX24r 3qrwAe/nm4q28H0F6OLE6cW2spZHiHnGmWJEx/ahCEsXpr3W23al3mE7lw8AGMH+qCpt OMdKeV23fqUP+kxPGvlQ/a7NybTVWb8UfEecJGmljw5w+AqEc2zyIrL+chl8lyo9NeQg wRD+iuIJV8eH2FeFk2z4H524s4jiZu0DLP27g5QmvGh+qyFszw8zulVtQh0r5uUVwBKR 0sZBLtW9iRlQalaDvIi1e/pq9p44AbaEERDuxh745nCo/fG+4jOq137dgXXbiMWeg0/h K8PA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=Dk+TabjI; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id s4si10573263eja.517.2020.07.20.09.20.24; Mon, 20 Jul 2020 09:20:24 -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=@kernel.org header.s=default header.b=Dk+TabjI; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732720AbgGTQKQ (ORCPT + 15 others); Mon, 20 Jul 2020 12:10:16 -0400 Received: from mail.kernel.org ([198.145.29.99]:48674 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387647AbgGTQKP (ORCPT ); Mon, 20 Jul 2020 12:10:15 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 367872064B; Mon, 20 Jul 2020 16:10:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1595261414; bh=OrUqV8JJjkoxK8FuCM07uleGXeKVco3gz7e0rfHRBo0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Dk+TabjISWf+jQvVHxUpUH4insW+w74SbeN3oj+FMUiaXcfU8GFCcu/xsJkDFZbL/ +ERkAvS1s0WWKz2NRidAvMqkjcLJETK1LRdX89b204LhWloEWgSydDUJbia5YCzbBn oh+/2SCPuBbKWkzQewVDHs7euP32RWhyoTdmzuTk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Lars-Peter Clausen , Jonathan Cameron , "Andrew F. Davis" , Sasha Levin Subject: [PATCH 5.7 077/244] iio:health:afe4404 Fix timestamp alignment and prevent data leak. Date: Mon, 20 Jul 2020 17:35:48 +0200 Message-Id: <20200720152829.503117733@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200720152825.863040590@linuxfoundation.org> References: <20200720152825.863040590@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Jonathan Cameron [ Upstream commit f88ecccac4be348bbcc6d056bdbc622a8955c04d ] One of a class of bugs pointed out by Lars in a recent review. iio_push_to_buffers_with_timestamp assumes the buffer used is aligned to the size of the timestamp (8 bytes). This is not guaranteed in this driver which uses a 40 byte array of smaller elements on the stack. As Lars also noted this anti pattern can involve a leak of data to userspace and that indeed can happen here. We close both issues by moving to a suitable structure in the iio_priv() data with alignment explicitly requested. This data is allocated with kzalloc so no data can leak appart from previous readings. Fixes: 87aec56e27ef ("iio: health: Add driver for the TI AFE4404 heart monitor") Reported-by: Lars-Peter Clausen Signed-off-by: Jonathan Cameron Acked-by: Andrew F. Davis Signed-off-by: Jonathan Cameron Signed-off-by: Sasha Levin --- drivers/iio/health/afe4404.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) -- 2.25.1 diff --git a/drivers/iio/health/afe4404.c b/drivers/iio/health/afe4404.c index e728bbb21ca88..cebb1fd4d0b15 100644 --- a/drivers/iio/health/afe4404.c +++ b/drivers/iio/health/afe4404.c @@ -83,6 +83,7 @@ static const struct reg_field afe4404_reg_fields[] = { * @regulator: Pointer to the regulator for the IC * @trig: IIO trigger for this device * @irq: ADC_RDY line interrupt number + * @buffer: Used to construct a scan to push to the iio buffer. */ struct afe4404_data { struct device *dev; @@ -91,6 +92,7 @@ struct afe4404_data { struct regulator *regulator; struct iio_trigger *trig; int irq; + s32 buffer[10] __aligned(8); }; enum afe4404_chan_id { @@ -328,17 +330,17 @@ static irqreturn_t afe4404_trigger_handler(int irq, void *private) struct iio_dev *indio_dev = pf->indio_dev; struct afe4404_data *afe = iio_priv(indio_dev); int ret, bit, i = 0; - s32 buffer[10]; for_each_set_bit(bit, indio_dev->active_scan_mask, indio_dev->masklength) { ret = regmap_read(afe->regmap, afe4404_channel_values[bit], - &buffer[i++]); + &afe->buffer[i++]); if (ret) goto err; } - iio_push_to_buffers_with_timestamp(indio_dev, buffer, pf->timestamp); + iio_push_to_buffers_with_timestamp(indio_dev, afe->buffer, + pf->timestamp); err: iio_trigger_notify_done(indio_dev->trig);