From patchwork Mon Jul 20 15:36:42 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: 237557 Delivered-To: patch@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp2140419ilg; Mon, 20 Jul 2020 09:41:02 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwW9/iezl4RDWuiHC2eC1mb7Yi1rOla/Qts7bZy9stJzNonlxy6VlGyGk7pQ6UI4fIFlkM1 X-Received: by 2002:a50:d8c2:: with SMTP id y2mr21944020edj.114.1595263261834; Mon, 20 Jul 2020 09:41:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1595263261; cv=none; d=google.com; s=arc-20160816; b=d7ARQiAqqUKXQ1gij33rjMz07HMTBS4w+vs+XBtP5BrsUDM4ZUH4bdw1DcwUDY/al9 3+9n+QpE7lzXk9yKb5/CZH5JnwnIuxfCFitNU7n0dJwe8USuf9xEjyCOHNmk/3OmMF9V NjuBoEi69RxOj6fG/KXppJqI4HEKXmn1bAEgwHTxkz0r5B763NjYs4iNpkkVeTYKb9Bj aWSJPK4EN6mxw0frLFX/e3rRiFY+chSPm6t7qC1sanJ4ZsZIKGAHl521sBKkM/XyYKj/ heaTYqbIzmaFRXilEYsYKMSK0KzgGenKo6GmWOigiz3Hfm5+RVrGwh1IawnmRla3fVJe JAXw== 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=AJIvosN+mpjLbmIKpWq4RuIC3rSQYHklZTDxq8EXSq4=; b=IwC1Z1q96YFvvbsvAk9Nj8aP9KLvFbLatGaBWwm5NTTKT+TyHFmG1Z7bQHocgWMwEH jggJqPGrHlzyRxSF4IToDQ5+vXxtq6/tODz/8sFGWqYayv3hpi2XdsW2JACvPMAqIwGs Ye0FxOj/zNmgMJAWE05MlJajvjE2yfUttgSP9yU8JYnKReNASEfsrpPx3sIAtRltvFMF cLnxtefYFy5G9mrTkgmQ0pi9rOez9jFWqeic/Np1zUkhBHyHw/ehbMCzZ/w3B3n/ReVO 04u+SZboW0L5N2okB3iLX4P3dD+geHwYAKd7kPUM36S6X7aJlzIutwckbpUNnnzuhhqz iP8g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=sfSONZa7; 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 a19si10672506edy.575.2020.07.20.09.41.01; Mon, 20 Jul 2020 09:41:01 -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=sfSONZa7; 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 S1730134AbgGTPqX (ORCPT + 15 others); Mon, 20 Jul 2020 11:46:23 -0400 Received: from mail.kernel.org ([198.145.29.99]:41008 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730004AbgGTPqV (ORCPT ); Mon, 20 Jul 2020 11:46:21 -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 3110A22BF3; Mon, 20 Jul 2020 15:46:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1595259980; bh=fmeWhdhvaGBZT1EJ8XDeUQppJvMJz/VxtSuhIKoeQ58=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sfSONZa7+XLw/+6YLh7Txo39qeyDkF0JXEHwG6r1HaIzMGvyun+t8NzSzy2EgTCPp 2UctzHYC24EvDar41nsw1VP6F44tufkhEmWyhaKYqttieE2gvOTgiipZw4o35/b4WM VE3r1jnTQ2nC57YDMOR6n/EPTq4J8kxnHml6jaU4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Lars-Peter Clausen , Matt Ranostay , Alison Schofield , Jonathan Cameron , Stable@vger.kernel.org Subject: [PATCH 4.14 063/125] iio:humidity:hdc100x Fix alignment and data leak issues Date: Mon, 20 Jul 2020 17:36:42 +0200 Message-Id: <20200720152806.068859819@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200720152802.929969555@linuxfoundation.org> References: <20200720152802.929969555@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 ea5e7a7bb6205d24371373cd80325db1bc15eded 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. Fixes: 16bf793f86b2 ("iio: humidity: hdc100x: add triggered buffer support for HDC100X") Reported-by: Lars-Peter Clausen Acked-by: Matt Ranostay Cc: Alison Schofield Signed-off-by: Jonathan Cameron Cc: Signed-off-by: Greg Kroah-Hartman --- drivers/iio/humidity/hdc100x.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) --- a/drivers/iio/humidity/hdc100x.c +++ b/drivers/iio/humidity/hdc100x.c @@ -46,6 +46,11 @@ struct hdc100x_data { /* integration time of the sensor */ int adc_int_us[2]; + /* Ensure natural alignment of timestamp */ + struct { + __be16 channels[2]; + s64 ts __aligned(8); + } scan; }; /* integration time in us */ @@ -327,7 +332,6 @@ static irqreturn_t hdc100x_trigger_handl struct i2c_client *client = data->client; int delay = data->adc_int_us[0] + data->adc_int_us[1]; int ret; - s16 buf[8]; /* 2x s16 + padding + 8 byte timestamp */ /* dual read starts at temp register */ mutex_lock(&data->lock); @@ -338,13 +342,13 @@ static irqreturn_t hdc100x_trigger_handl } usleep_range(delay, delay + 1000); - ret = i2c_master_recv(client, (u8 *)buf, 4); + ret = i2c_master_recv(client, (u8 *)data->scan.channels, 4); if (ret < 0) { dev_err(&client->dev, "cannot read sensor data\n"); goto err; } - iio_push_to_buffers_with_timestamp(indio_dev, buf, + iio_push_to_buffers_with_timestamp(indio_dev, &data->scan, iio_get_time_ns(indio_dev)); err: mutex_unlock(&data->lock);