From patchwork Tue Sep 15 14:13:17 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: 305243 Delivered-To: patch@linaro.org Received: by 2002:a92:5ad1:0:0:0:0:0 with SMTP id b78csp2595129ilg; Tue, 15 Sep 2020 07:22:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJziKLxDQUmHgAijybbUHBOtYLp8XJSss5uP1yLkyIBJm3VagBuAm/cxo4w4HWWh+qSqccMc X-Received: by 2002:a17:906:1dd0:: with SMTP id v16mr19934008ejh.309.1600179761003; Tue, 15 Sep 2020 07:22:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1600179760; cv=none; d=google.com; s=arc-20160816; b=UoiveHbeJmC30+WqobA1CUribGht3dsHjrMXGb3Js+KVZqRAEUNLlLIF4D4iiwcX4c NZ0sCUO/bXwUPLv57D5a520DOkeNgLZfdIqRwf7ZnqHgDdjFY2VeCSmEMMNcS3Uv9OK0 dLPSRbuEx5GPqNqEShpcn745ZLUKn3MIctmrfPoq4jkiHCKZItkD9NyeXjaaAmg9g5js r5zeBLZgxWL9ANs0QW4rJK1/ze3ZVqkgh69UxVYlugly5p688ividcb42KKor0J+sRBI RqywOlkk0cRn4/AElzpWS7c2HvRNtAV9ssgAk5azJc5dfI3nzx0m9CQOp/5b51jSm6mz emiA== 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=Y7lsneups4nQErM9pSO6+gMGbrdXIQUzxcGmoew1pyA=; b=yUXUMEDTLND+i7lzU2r2QdNnWjrfpHsbq+rqVbT/mIXALywPCZmnnWvWS7XA8TnP1j ZNqggmESCKzbjv08tegcnpDf+hNv2RM1vwihaCefVlLb5ihswyJekNY/n75AgOArx3BR iaIDP6WCwZySVfATA5FhGny738DFbG/mOVUGxJX/jv8Cpvgh9IKo/P5y7ohEY6TTmZOy zT5WG9Rz67MIVJt4l9BOt6TQzTLf11gMCuwp7rdIxJ7milhcBad1qvMp8eDJ4ugw+/Xi +nTx0q/9mccQC7MFolHPAmuZHibGRbt/GMeuRwWrW2VBx8iPDRjMeU8qUNH9HKszQpH2 cAyA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=FjUe7275; 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=fail (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 g12si3507256edn.403.2020.09.15.07.22.40; Tue, 15 Sep 2020 07:22:40 -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=FjUe7275; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726818AbgIOOVo (ORCPT + 15 others); Tue, 15 Sep 2020 10:21:44 -0400 Received: from mail.kernel.org ([198.145.29.99]:60852 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726855AbgIOOVH (ORCPT ); Tue, 15 Sep 2020 10:21:07 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (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 A89BD2224B; Tue, 15 Sep 2020 14:16:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600179420; bh=QtLLmG3kh0dT55OUon/4hi34yStQhL40NliPqaR7GU4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FjUe7275vy7T+WAbGNh8utlVVKjlleVZpaN0+nFYCI2mEQiduOTs+OFTkYMgnJ+WF b9xe/Vt6dPxNWKV5jLikD68+j76Pgwzvs9AcWz2/b9r4cIRlsG5Rmp7TKIQ+CE97Rv Iq9LoQr2AQPXLGzWzD64qGOfjfWhGZzWCpMGpl10= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Lars-Peter Clausen , Jonathan Cameron , Stable@vger.kernel.org, Andy Shevchenko Subject: [PATCH 4.19 52/78] iio:accel:mma7455: Fix timestamp alignment and prevent data leak. Date: Tue, 15 Sep 2020 16:13:17 +0200 Message-Id: <20200915140636.183263323@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200915140633.552502750@linuxfoundation.org> References: <20200915140633.552502750@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 commit 7e5ac1f2206eda414f90c698fe1820dee873394d 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 a 16 byte u8 array 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 ensured by use of an explicit c structure. This data is allocated with kzalloc so no data can leak appart from previous readings. The force alignment of ts is not strictly necessary in this particularly case but does make the code less fragile. Fixes: a84ef0d181d9 ("iio: accel: add Freescale MMA7455L/MMA7456L 3-axis accelerometer driver") Reported-by: Lars-Peter Clausen Signed-off-by: Jonathan Cameron Cc: Reviewed-by: Andy Shevchenko Signed-off-by: Greg Kroah-Hartman --- drivers/iio/accel/mma7455_core.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) --- a/drivers/iio/accel/mma7455_core.c +++ b/drivers/iio/accel/mma7455_core.c @@ -55,6 +55,14 @@ struct mma7455_data { struct regmap *regmap; + /* + * Used to reorganize data. Will ensure correct alignment of + * the timestamp if present + */ + struct { + __le16 channels[3]; + s64 ts __aligned(8); + } scan; }; static int mma7455_drdy(struct mma7455_data *mma7455) @@ -85,19 +93,19 @@ static irqreturn_t mma7455_trigger_handl struct iio_poll_func *pf = p; struct iio_dev *indio_dev = pf->indio_dev; struct mma7455_data *mma7455 = iio_priv(indio_dev); - u8 buf[16]; /* 3 x 16-bit channels + padding + ts */ int ret; ret = mma7455_drdy(mma7455); if (ret) goto done; - ret = regmap_bulk_read(mma7455->regmap, MMA7455_REG_XOUTL, buf, - sizeof(__le16) * 3); + ret = regmap_bulk_read(mma7455->regmap, MMA7455_REG_XOUTL, + mma7455->scan.channels, + sizeof(mma7455->scan.channels)); if (ret) goto done; - iio_push_to_buffers_with_timestamp(indio_dev, buf, + iio_push_to_buffers_with_timestamp(indio_dev, &mma7455->scan, iio_get_time_ns(indio_dev)); done: