From patchwork Tue Nov 3 20:35:29 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: 320495 Delivered-To: patch@linaro.org Received: by 2002:a92:7b12:0:0:0:0:0 with SMTP id w18csp4938372ilc; Tue, 3 Nov 2020 13:51:40 -0800 (PST) X-Google-Smtp-Source: ABdhPJz1LqBiOIvxK10K0n9dGvju/D02Trp9JMN3Fuyf/RDdBPgl6w+mS8qIeVlKVFxgDFqLZ1X/ X-Received: by 2002:a17:906:4a4c:: with SMTP id a12mr21410426ejv.392.1604440300757; Tue, 03 Nov 2020 13:51:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1604440300; cv=none; d=google.com; s=arc-20160816; b=kEfQyAx/J7Y9m5CiM+AnSQM0TJikq5TBpAmRCKhxmbK5MRZOOOBO8em3DvX6peyivo kYypITzVjJTxEDeGJKRxBFhHt2R6i5P+qMdXe8ppTZME9OWesiQnIj1CGN4xY6zmyflO /hTcilTVOLxrwiF0W+fvHDRqLx2kevwB7kcBphbe7TYdsQW8hi+f20mSsVuZLoWXj8Nq hFC3UmR43SGcPhvJTe7CDaLB+SB9nRTJuXIUjYdETg/9M6QVF+1RFnbTVM0T/Vu/4BAL B2GknXAbO54miFjzCFFDtsdYWc3rsvDEoAkezzZBaRWaMNWnBv9eVn0SVw1SET1e5sjl TeNA== 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=c/lFjaJ849yYlHnI68RqS0MUfAyj6RY2tG5xv0AeCmQ=; b=Y9SJ+4bIDCpFFu/PUn7aA9Gto04mUqfHSitNsqQYE0uX/pv77CDtWlv4imOxTb/BEV hQdVFRdllteJIWRGL3cPEiX5qykwFDNVN68KbdvXhz41Xoqwn2nRQE8jWOiYfXRJkAwk ap2duBHOAYf7jyM2Am1VvKb3Z8EiiaVGFDaBS4MSh9FsGsMyDRmU/vT1hatMN0FK0hRm +LS2NJoLOFaI9m2Zy2M5sfphsWaPojOU+ebdGKZLddcwdNW1KW3Z3l5bgnodceEd+Tx2 M7Guh49Jq4+8JwvQ+MovB7F/DnR2/qJF2SKzySu5x2XhuNbgsIajBEDIKKDWzXQW1RkH uuvQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=STqlmSUf; 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 m12si1692642edq.242.2020.11.03.13.51.40; Tue, 03 Nov 2020 13:51:40 -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=@kernel.org header.s=default header.b=STqlmSUf; 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 S1731428AbgKCVvk (ORCPT + 15 others); Tue, 3 Nov 2020 16:51:40 -0500 Received: from mail.kernel.org ([198.145.29.99]:39774 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731449AbgKCUsV (ORCPT ); Tue, 3 Nov 2020 15:48:21 -0500 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 7E75022409; Tue, 3 Nov 2020 20:48:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604436501; bh=BKfdIyt5z62L/599YN5431rgr0e3luTrifZW3PySgKU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=STqlmSUfP06TL4aDJ2swdTbs6GkSwI7eMJA71x1w8MKOLmhzgR6r/oYOiFlURiMcb 6CbEALWu8lbWSlJqlQUGMPH0bd81K1llTG1O7Uyl1slUFpk5EkdyREaFChJu5K0hG3 Agw31IvMvFmJLHn4SHcNO27Z6UdrsOGaWdhWe92M= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Lars-Peter Clausen , Jonathan Cameron , Andy Shevchenko , Stable@vger.kernel.org Subject: [PATCH 5.9 278/391] iio:gyro:itg3200: Fix timestamp alignment and prevent data leak. Date: Tue, 3 Nov 2020 21:35:29 +0100 Message-Id: <20201103203405.793226857@linuxfoundation.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201103203348.153465465@linuxfoundation.org> References: <20201103203348.153465465@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 10ab7cfd5522f0041028556dac864a003e158556 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 array of smaller elements on the stack. This is fixed by using an explicit c structure. As there are no holes in the structure, there is no possiblity of data leakage in this case. The explicit alignment of ts is not strictly necessary but potentially makes the code slightly less fragile. It also removes the possibility of this being cut and paste into another driver where the alignment isn't already true. Fixes: 36e0371e7764 ("iio:itg3200: Use iio_push_to_buffers_with_timestamp()") Reported-by: Lars-Peter Clausen Signed-off-by: Jonathan Cameron Reviewed-by: Andy Shevchenko Cc: Link: https://lore.kernel.org/r/20200722155103.979802-6-jic23@kernel.org Signed-off-by: Greg Kroah-Hartman --- drivers/iio/gyro/itg3200_buffer.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) --- a/drivers/iio/gyro/itg3200_buffer.c +++ b/drivers/iio/gyro/itg3200_buffer.c @@ -46,13 +46,20 @@ static irqreturn_t itg3200_trigger_handl struct iio_poll_func *pf = p; struct iio_dev *indio_dev = pf->indio_dev; struct itg3200 *st = iio_priv(indio_dev); - __be16 buf[ITG3200_SCAN_ELEMENTS + sizeof(s64)/sizeof(u16)]; + /* + * Ensure correct alignment and padding including for the + * timestamp that may be inserted. + */ + struct { + __be16 buf[ITG3200_SCAN_ELEMENTS]; + s64 ts __aligned(8); + } scan; - int ret = itg3200_read_all_channels(st->i2c, buf); + int ret = itg3200_read_all_channels(st->i2c, scan.buf); if (ret < 0) goto error_ret; - iio_push_to_buffers_with_timestamp(indio_dev, buf, pf->timestamp); + iio_push_to_buffers_with_timestamp(indio_dev, &scan, pf->timestamp); iio_trigger_notify_done(indio_dev->trig);