From patchwork Mon Dec 28 12:51:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 352682 Delivered-To: patch@linaro.org Received: by 2002:a02:85a7:0:0:0:0:0 with SMTP id d36csp9797424jai; Mon, 28 Dec 2020 06:43:05 -0800 (PST) X-Google-Smtp-Source: ABdhPJzKqQEblUAAPBHGwfjXSNBO9SdXYflqicsUhU36nAMRnXNMyN3Sz2JVvu67xyGZAJGzde4z X-Received: by 2002:a50:f9cc:: with SMTP id a12mr41669279edq.335.1609166585397; Mon, 28 Dec 2020 06:43:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1609166585; cv=none; d=google.com; s=arc-20160816; b=YeD4kv7b7Kb1AJqwcI1oNeNuzZJOKbsZ6HGuZVNaqZmhLIwDWFzuHkwPYdWtftglBz jYHdvKp7kPtZxajKnKGfjXFJxKqjTL4GrvR+bWN3dz4S0OWkVoySO9OQ59zbWe99zCRU kgqd59zWgTH92FUhNpFh0MJ2iUT6kEYdGbloGQbADJyITRm2JZBituTfzLyDcqzUv3OT KhXVoDy902UcT0ZROrdGcs5fnhbEBkFOhb3ou2IWd6KIT1GE2DhLr/oF8zJ3nYiUatVa JGzAgLxF78TOZg6Y2vwmDhxJewLGTm5gOubF3B9JRMk0iuwcagNvk+YrxW88wuyxyERw SFog== 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=dNbK44PWuBGcjDrju/H9bRfJPsshscZILy7igJWyqH4=; b=XOEsrU4mz/IMc3hKw+jOVip6A0Pglg01ureOyz3YVsQ9b1QqO1Rwr06+PvyEUr5CQc SE5KvsJuvhZUKt4O5yaGhm3ysAT7k9lWeFCpnG6bH/CPR2/IoeoHFjfFaYhOuoDo3M/v T86Ud1IDAp//atb/tt3F2gUciGtjoxaYM6FVuMyiDdj4IyBasgKmDVjKwGXMLcTxvtsP v5YYkHlYpZVvsOFfDtq1ua/NOCAgmE8ayzoEMf1i1u/9hrB4p6s4PA1z5Cpy5DlwFvia DRCdJfS9JGroN9fkkSHIu5RizTveIJAPAc1+y16QQG2JBnVgNrqRtZuJyy1zzCbniUPc mzxA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=sN1eXa2t; 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 dm18si19719632edb.422.2020.12.28.06.43.05; Mon, 28 Dec 2020 06:43:05 -0800 (PST) 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=sN1eXa2t; 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 S2392136AbgL1Oi1 (ORCPT + 14 others); Mon, 28 Dec 2020 09:38:27 -0500 Received: from mail.kernel.org ([198.145.29.99]:39562 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2503624AbgL1Obz (ORCPT ); Mon, 28 Dec 2020 09:31:55 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 239712242A; Mon, 28 Dec 2020 14:31:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1609165899; bh=MqYK4bByvyed3WeX+W3EJNVYkbjV7CdwuADB16FkQpw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sN1eXa2tWKisNKRjMqTUL9V6Y9PqVnKSFm2juca+9Vw+2sB5doM0FoJVcH+pCeb4V K8Ua1hdLwhWDMwy7h4K2GUXwnKS74teuvxRYruhq8yQPXH2io9BrbOlcJcwcFaEcAU r68kfjCT+o9vD6Hg8TkGWvMPOpyPF4Q9gaieoukY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jonathan Cameron , Alexandru Ardelean , Mikko Koivunen , Stable@vger.kernel.org Subject: [PATCH 5.10 677/717] iio:light:rpr0521: Fix timestamp alignment and prevent data leak. Date: Mon, 28 Dec 2020 13:51:15 +0100 Message-Id: <20201228125053.419129991@linuxfoundation.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201228125020.963311703@linuxfoundation.org> References: <20201228125020.963311703@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 a61817216bcc755eabbcb1cf281d84ccad267ed1 upstream. 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 an 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(). This data is allocated with kzalloc() so no data can leak apart from previous readings and in this case the status byte from the device. The forced alignment of ts is not necessary in this case but it potentially makes the code less fragile. >From personal communications with Mikko: We could probably split the reading of the int register, but it would mean a significant performance cost of 20 i2c clock cycles. Fixes: e12ffd241c00 ("iio: light: rpr0521 triggered buffer") Signed-off-by: Jonathan Cameron Reviewed-by: Alexandru Ardelean Cc: Mikko Koivunen Cc: Link: https://lore.kernel.org/r/20200920112742.170751-2-jic23@kernel.org Signed-off-by: Greg Kroah-Hartman --- drivers/iio/light/rpr0521.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) --- a/drivers/iio/light/rpr0521.c +++ b/drivers/iio/light/rpr0521.c @@ -194,6 +194,17 @@ struct rpr0521_data { bool pxs_need_dis; struct regmap *regmap; + + /* + * Ensure correct naturally aligned timestamp. + * Note that the read will put garbage data into + * the padding but this should not be a problem + */ + struct { + __le16 channels[3]; + u8 garbage; + s64 ts __aligned(8); + } scan; }; static IIO_CONST_ATTR(in_intensity_scale_available, RPR0521_ALS_SCALE_AVAIL); @@ -449,8 +460,6 @@ static irqreturn_t rpr0521_trigger_consu struct rpr0521_data *data = iio_priv(indio_dev); int err; - u8 buffer[16]; /* 3 16-bit channels + padding + ts */ - /* Use irq timestamp when reasonable. */ if (iio_trigger_using_own(indio_dev) && data->irq_timestamp) { pf->timestamp = data->irq_timestamp; @@ -461,11 +470,11 @@ static irqreturn_t rpr0521_trigger_consu pf->timestamp = iio_get_time_ns(indio_dev); err = regmap_bulk_read(data->regmap, RPR0521_REG_PXS_DATA, - &buffer, + data->scan.channels, (3 * 2) + 1); /* 3 * 16-bit + (discarded) int clear reg. */ if (!err) iio_push_to_buffers_with_timestamp(indio_dev, - buffer, pf->timestamp); + &data->scan, pf->timestamp); else dev_err(&data->client->dev, "Trigger consumer can't read from sensor.\n");