From patchwork Mon Dec 28 12:50:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 352735 Delivered-To: patch@linaro.org Received: by 2002:a02:85a7:0:0:0:0:0 with SMTP id d36csp9848324jai; Mon, 28 Dec 2020 07:57:08 -0800 (PST) X-Google-Smtp-Source: ABdhPJxkrvG+LXILQIdmn1RT3RBLBWNr1upEx6fUye7UmCB3XX67b4BmeWTDZv4cWM/Om1YuoUnc X-Received: by 2002:a17:906:f9da:: with SMTP id lj26mr41131342ejb.467.1609171028787; Mon, 28 Dec 2020 07:57:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1609171028; cv=none; d=google.com; s=arc-20160816; b=WFy3dv7fTQ6BPM+pVRDTBXxgTifsEc9Ri79FTY2r9IGwgwlBLGrpYeUZJjPSNPecyd D9a5nk1ZR5/RlKXki6sZO/HBMIP/hQraecbmfvH49OtvarpeUnaQQeCs3SYK6CoEPGCG lWnRXyPp5dkIXEKdyAfVps//IpEM6hXsut5g6068gRnaWDsoG6fAtnDbu8QPXrW1+SIJ Y82B2e0YRqjtPogISQFA3IgaqF/twMlvwFsSK4kz2sSBujOiYbpVNIsG4ERbyaGe7e4/ E1Owaf8H6uL0XC2yYtSjabo+70FHYmn8JJ8cqSTXQml36O5A5bLiRGJ8d7777PjVoVG5 holg== 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=9EJTdgxUbos8m0KE83hxhhOBdiDwdDg2g+XmrrQSFkY=; b=aekTD8W9NQIuVsfpAAxJIfcx4IyZS8KXZIyOzgdpEWuO6FQKCvJ7pQdhyXUKXhgLPR XUl8Zq0ozWJY0TT9Og9kcGC+AdDjcFFf0trrse37oaK9oIGB7v0rLYKnWiU/BW7udLGj T+wq8wDEb97FOzlHsvWLPKVVRhZe/A0hide0d7ZKzseqB/Kq4DhuYhcntGuhtKIXj6kP iSVmpV1JGuKJ8brrZ167tQSNaKNt11fDBzAaHHBQcBn9V8tb4R1jcyfcUArUa9HHk1Q8 BeTqfVpHXIM5x8k+Uw1lwbpjmjSXubmWv4tDk+8Z5++YOG27pEP7qbDVeiDul94B2R10 KQOg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=1Fop+1lE; 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=pass (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 j26si18774061ejf.716.2020.12.28.07.57.08; Mon, 28 Dec 2020 07:57:08 -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=@linuxfoundation.org header.s=korg header.b=1Fop+1lE; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2393220AbgL1Pzr (ORCPT + 14 others); Mon, 28 Dec 2020 10:55:47 -0500 Received: from mail.kernel.org ([198.145.29.99]:35674 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389418AbgL1Nfo (ORCPT ); Mon, 28 Dec 2020 08:35:44 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 84BCF22A84; Mon, 28 Dec 2020 13:35:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1609162529; bh=fT2Ef8ACX3SqVzjESbjRL4wVWp/i1bWFda6mD95v0zM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1Fop+1lEGT/J5nsmihAuGPJ/tSUb+xgNnBUweCOlKCQxOSONE1ROx1LggLmx68EtR +3ecUgdQ9UM09qN4KcLPUCUwtGLDebPjjK03bZmfZfTtg+wPUqcJxrl96VJfANchBh MY48gO2n1GaosPhZM0bkX8BBMu6ypAsRD+23Yhgo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Lars-Peter Clausen , Jonathan Cameron , Alexandru Ardelean , Lorenzo Bianconi , Stable@vger.kernel.org Subject: [PATCH 4.19 331/346] iio:light:st_uvis25: Fix timestamp alignment and prevent data leak. Date: Mon, 28 Dec 2020 13:50:50 +0100 Message-Id: <20201228124935.776763822@linuxfoundation.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201228124919.745526410@linuxfoundation.org> References: <20201228124919.745526410@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 d837a996f57c29a985177bc03b0e599082047f27 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() This data is allocated with kzalloc() so no data can leak apart from previous readings. A local unsigned int variable is used for the regmap call so it is clear there is no potential issue with writing into the padding of the structure. Fixes: 3025c8688c1e ("iio: light: add support for UVIS25 sensor") Reported-by: Lars-Peter Clausen Signed-off-by: Jonathan Cameron Reviewed-by: Alexandru Ardelean Acked-by: Lorenzo Bianconi Cc: Link: https://lore.kernel.org/r/20200920112742.170751-3-jic23@kernel.org Signed-off-by: Greg Kroah-Hartman --- drivers/iio/light/st_uvis25.h | 5 +++++ drivers/iio/light/st_uvis25_core.c | 8 +++++--- 2 files changed, 10 insertions(+), 3 deletions(-) --- a/drivers/iio/light/st_uvis25.h +++ b/drivers/iio/light/st_uvis25.h @@ -28,6 +28,11 @@ struct st_uvis25_hw { struct iio_trigger *trig; bool enabled; int irq; + /* Ensure timestamp is naturally aligned */ + struct { + u8 chan; + s64 ts __aligned(8); + } scan; }; extern const struct dev_pm_ops st_uvis25_pm_ops; --- a/drivers/iio/light/st_uvis25_core.c +++ b/drivers/iio/light/st_uvis25_core.c @@ -235,17 +235,19 @@ static const struct iio_buffer_setup_ops static irqreturn_t st_uvis25_buffer_handler_thread(int irq, void *p) { - u8 buffer[ALIGN(sizeof(u8), sizeof(s64)) + sizeof(s64)]; struct iio_poll_func *pf = p; struct iio_dev *iio_dev = pf->indio_dev; struct st_uvis25_hw *hw = iio_priv(iio_dev); + unsigned int val; int err; - err = regmap_read(hw->regmap, ST_UVIS25_REG_OUT_ADDR, (int *)buffer); + err = regmap_read(hw->regmap, ST_UVIS25_REG_OUT_ADDR, &val); if (err < 0) goto out; - iio_push_to_buffers_with_timestamp(iio_dev, buffer, + hw->scan.chan = val; + + iio_push_to_buffers_with_timestamp(iio_dev, &hw->scan, iio_get_time_ns(iio_dev)); out: