From patchwork Mon Jul 20 15:35:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 237507 Delivered-To: patch@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp2113726ilg; Mon, 20 Jul 2020 09:08:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwdaZqeeMpqTpUIIBOIihlirnvpL9rX5HVg/ue385tXfmgGiKtCoDXa8mTiHglIfeWdwVOO X-Received: by 2002:a50:bece:: with SMTP id e14mr21530242edk.190.1595261310634; Mon, 20 Jul 2020 09:08:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1595261310; cv=none; d=google.com; s=arc-20160816; b=Ml9CqV3NuBWnZcst345xl0s+ixxzbx8L6/FdnrvCNqLMkh6mgfUy92iNEb+IDWxK0I dlBb0RVbbjXaWnFY+jEZMnHOSZzUg7cNm4zezBYzk7iTap2T/QPZZg/yh4knxCKe2Ut8 CyzEDfPPKaUoNU+IsuRuK5qHAl+IYwHrc+7Q1id2ssyWqjQd0mjLzEC7HJz7zSlGe/Zz bFDEjXXNKJNYkev5VsJEwSoAQMHwaiZgT/s2WxSEdKIqGTw9MSn3K88dRMlXGVOVN4Yy MUF4xweCIzOwNHWIGQIKA0fo2kXFekQ6/MjiszHn9r+DDhQRcKBSJN88iswXmj4K5g4J CTZQ== 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=k6U0NZgnQQRIoQRUlqjRi7AMq0FczpcvAqO0hXo/poo=; b=rIi0XLahn/ART60vxn3GTkrb/FM9jWlbvgPJXafJmQm0AfKIM5GOerkBr74DAWiMr4 B5Fq+80EAEGSrCl5tc+wGO9bB5E7HP26WSpsEr1bK4rnYkmtdmriGV6oeXpDWNuvCfcY ayeDqTluvwFVSgcH4mZL0hJ0F+YLPIIwN2jeHPVzx/xRy9hszB5vscYEeX+zyXurEWDJ 0t3mAr7C9w9bhJmXGshiRUSwYXqW3Pk/kSGkZa0IajeYOUX6DWE560CHz8+0iAyjtWSN HHNdsXYhqsmy5sfK13v+uvUBWPBNnHBGzaAJZxYuTQUFImmeSJ/FJy3h+Xe9XDGStssc YWUQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=tbTNluYH; 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 i16si10780351edx.275.2020.07.20.09.08.30; Mon, 20 Jul 2020 09:08:30 -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=tbTNluYH; 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 S1733254AbgGTQI2 (ORCPT + 15 others); Mon, 20 Jul 2020 12:08:28 -0400 Received: from mail.kernel.org ([198.145.29.99]:45902 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1733300AbgGTQI1 (ORCPT ); Mon, 20 Jul 2020 12:08:27 -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 475722064B; Mon, 20 Jul 2020 16:08:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1595261306; bh=IReQaCQ1JzU9pd3WgkQG2WkZwI3+Cf/nWKg9g+Jb9Do=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tbTNluYHU7wApbjAQQ/WFls6/lFYFFK8PMbecxf8l9ZdQhGz8foRWxXiGwcbqx1e5 RhLn5CkxjPZtqIr7jSFgpL93xQ9gFKYjMADBYCggpI0M7tihjHQxW+tK76TkBWX7WB HX6OMswBL77rpnbXhwxtah2Av7IwFw4WeYd7XaU8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Lars-Peter Clausen , Jonathan Cameron , "Andrew F. Davis" , Stable@vger.kernel.org Subject: [PATCH 5.7 068/244] iio:health:afe4403 Fix timestamp alignment and prevent data leak. Date: Mon, 20 Jul 2020 17:35:39 +0200 Message-Id: <20200720152829.084625643@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 3f9c6d38797e9903937b007a341dad0c251765d6 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 32 byte 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 with alignment explicitly requested. This data is allocated with kzalloc so no data can leak appart from previous readings. Fixes: eec96d1e2d31 ("iio: health: Add driver for the TI AFE4403 heart monitor") Reported-by: Lars-Peter Clausen Signed-off-by: Jonathan Cameron Acked-by: Andrew F. Davis Cc: Signed-off-by: Jonathan Cameron Signed-off-by: Greg Kroah-Hartman --- drivers/iio/health/afe4403.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) --- a/drivers/iio/health/afe4403.c +++ b/drivers/iio/health/afe4403.c @@ -63,6 +63,7 @@ static const struct reg_field afe4403_re * @regulator: Pointer to the regulator for the IC * @trig: IIO trigger for this device * @irq: ADC_RDY line interrupt number + * @buffer: Used to construct data layout to push into IIO buffer. */ struct afe4403_data { struct device *dev; @@ -72,6 +73,8 @@ struct afe4403_data { struct regulator *regulator; struct iio_trigger *trig; int irq; + /* Ensure suitable alignment for timestamp */ + s32 buffer[8] __aligned(8); }; enum afe4403_chan_id { @@ -309,7 +312,6 @@ static irqreturn_t afe4403_trigger_handl struct iio_dev *indio_dev = pf->indio_dev; struct afe4403_data *afe = iio_priv(indio_dev); int ret, bit, i = 0; - s32 buffer[8]; u8 tx[4] = {AFE440X_CONTROL0, 0x0, 0x0, AFE440X_CONTROL0_READ}; u8 rx[3]; @@ -326,9 +328,9 @@ static irqreturn_t afe4403_trigger_handl if (ret) goto err; - buffer[i++] = (rx[0] << 16) | - (rx[1] << 8) | - (rx[2]); + afe->buffer[i++] = (rx[0] << 16) | + (rx[1] << 8) | + (rx[2]); } /* Disable reading from the device */ @@ -337,7 +339,8 @@ static irqreturn_t afe4403_trigger_handl if (ret) goto err; - iio_push_to_buffers_with_timestamp(indio_dev, buffer, pf->timestamp); + iio_push_to_buffers_with_timestamp(indio_dev, afe->buffer, + pf->timestamp); err: iio_trigger_notify_done(indio_dev->trig);