From patchwork Mon Jul 20 15:35:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 237496 Delivered-To: patch@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp2113622ilg; Mon, 20 Jul 2020 09:08:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwjBl9LNlbHGpF+8SOb81AxuS3cwttm/lJBiczEwq/3sFzPTxPvP95K2j5MaaPBkOZAyMaf X-Received: by 2002:a17:906:a892:: with SMTP id ha18mr21921896ejb.462.1595261304946; Mon, 20 Jul 2020 09:08:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1595261304; cv=none; d=google.com; s=arc-20160816; b=R9qxQZ1ycG6BHq7ZQuk0JLYpdOKfTIEBmC1Dqf8VJbgLjhxw+Mbnto4jf75GMTn4lR hjIwbmizRL7dKuVs2V1cbVEtAmluH+cXbhSg2Qzsi2CzRsW2V3x7n/9JzgHV7wA9uL9g dDAkKY8hDIPIuLaSFDwfKVrTLrGdZOsdgdNECrTzcgrtegf5CpBNjwmEwW//l5lWdzgD YKyvE6sFhIeH+DHPmiWuqr00hSlvrGXZjZcWghWhO58RU2rB9vS0R3ZoYegnSTMUbwuv wLwQDabIbJiZSx20v41YYEgfLPsUHl9TPRWV3DJjbiBMnpYTZ2af3g91mzw1MlX2RONQ NQBA== 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=n/Viv3BKqq8pIm+TYLRX1e59MtTTFZasgakEooSEyHw=; b=VnNUA32t4OpEWFh720ivK7PU7z707pj8M1ydGylvmB/jltpcsQblmWuNJ7g1N90Sh8 rAmqJbsHK0Sjzij2a5VbpnZDg1uNbDJJfABQ7qhzwjAQxdqYoEdhmz2f7XvYI3Z7hHa0 y07G8uFUdCOjW9sjWzTcnFj5gOI6FpVTEJvMccXNKt7TnYDzD3g6Yt7wBGToD4SngDTK cTX8GIKwAIZtH+r0eMZr5sJr1U1mRe3KxzgmsN4DwrZpt5NXZbc+Oc3n1G8jvjimTi3Z KOCh0R+qn0I1f6td0u2fQL0Vdl2G3OwJZlef0/wnLHJn57meo8UUcH3rdEq/iW/YdDWo 9yoQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=SKha4bXs; 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 dh22si10537929edb.38.2020.07.20.09.08.24; Mon, 20 Jul 2020 09:08: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=SKha4bXs; 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 S1733285AbgGTQIX (ORCPT + 15 others); Mon, 20 Jul 2020 12:08:23 -0400 Received: from mail.kernel.org ([198.145.29.99]:45750 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1733254AbgGTQIW (ORCPT ); Mon, 20 Jul 2020 12:08:22 -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 BAEF62065E; Mon, 20 Jul 2020 16:08:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1595261301; bh=gBJjacVL2m/4ejgMgslD8NKdAbwGMCJFnQvE0Zo+e6Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SKha4bXsF9oGr4yaofeiqrVywksEOxX4/l9NA+gmO2ez4w3RZOn3I6iKFlLZnhWuh RwqFsnISKu0phKfVafxS2Mw0B7+I3cLNIcUuyD541MRMxjaEp68E7WLRpVCbi/X9F2 lDw/pJa3i9YfkIma9AiroIpd+2C2u7ocVQZBazkI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Lars-Peter Clausen , Lorenzo Bianconi , Jonathan Cameron , Stable@vger.kernel.org Subject: [PATCH 5.7 066/244] iio:humidity:hts221 Fix alignment and data leak issues Date: Mon, 20 Jul 2020 17:35:37 +0200 Message-Id: <20200720152828.997519701@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 commit 5c49056ad9f3c786f7716da2dd47e4488fc6bd25 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() data. This data is allocated with kzalloc so no data can leak apart from previous readings. Explicit alignment of ts needed to ensure consistent padding on all architectures (particularly x86_32 with it's 4 byte alignment of s64) Fixes: e4a70e3e7d84 ("iio: humidity: add support to hts221 rh/temp combo device") Reported-by: Lars-Peter Clausen Acked-by: Lorenzo Bianconi Signed-off-by: Jonathan Cameron Cc: Signed-off-by: Greg Kroah-Hartman --- drivers/iio/humidity/hts221.h | 7 +++++-- drivers/iio/humidity/hts221_buffer.c | 9 +++++---- 2 files changed, 10 insertions(+), 6 deletions(-) --- a/drivers/iio/humidity/hts221.h +++ b/drivers/iio/humidity/hts221.h @@ -14,8 +14,6 @@ #include -#define HTS221_DATA_SIZE 2 - enum hts221_sensor_type { HTS221_SENSOR_H, HTS221_SENSOR_T, @@ -39,6 +37,11 @@ struct hts221_hw { bool enabled; u8 odr; + /* Ensure natural alignment of timestamp */ + struct { + __le16 channels[2]; + s64 ts __aligned(8); + } scan; }; extern const struct dev_pm_ops hts221_pm_ops; --- a/drivers/iio/humidity/hts221_buffer.c +++ b/drivers/iio/humidity/hts221_buffer.c @@ -162,7 +162,6 @@ static const struct iio_buffer_setup_ops static irqreturn_t hts221_buffer_handler_thread(int irq, void *p) { - u8 buffer[ALIGN(2 * HTS221_DATA_SIZE, sizeof(s64)) + sizeof(s64)]; struct iio_poll_func *pf = p; struct iio_dev *iio_dev = pf->indio_dev; struct hts221_hw *hw = iio_priv(iio_dev); @@ -172,18 +171,20 @@ static irqreturn_t hts221_buffer_handler /* humidity data */ ch = &iio_dev->channels[HTS221_SENSOR_H]; err = regmap_bulk_read(hw->regmap, ch->address, - buffer, HTS221_DATA_SIZE); + &hw->scan.channels[0], + sizeof(hw->scan.channels[0])); if (err < 0) goto out; /* temperature data */ ch = &iio_dev->channels[HTS221_SENSOR_T]; err = regmap_bulk_read(hw->regmap, ch->address, - buffer + HTS221_DATA_SIZE, HTS221_DATA_SIZE); + &hw->scan.channels[1], + sizeof(hw->scan.channels[1])); if (err < 0) goto out; - iio_push_to_buffers_with_timestamp(iio_dev, buffer, + iio_push_to_buffers_with_timestamp(iio_dev, &hw->scan, iio_get_time_ns(iio_dev)); out: