From patchwork Mon Jul 20 15:36: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: 237562 Delivered-To: patch@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp2143833ilg; Mon, 20 Jul 2020 09:45:23 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxfN9Y4KGl1nh9fnllCuZRRUuHV9xFZLi0VbawHu4bctV3OR0XlCRM5246Pi4I5fkKMbASI X-Received: by 2002:aa7:d8ca:: with SMTP id k10mr22379790eds.108.1595263523569; Mon, 20 Jul 2020 09:45:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1595263523; cv=none; d=google.com; s=arc-20160816; b=bZiz6oDJoGo6fv25YfcScKj8uI43JYCsiy4byCs98xOB+3dKXjPoG74kVHt4UEOBhK 5my871nzA9epeBeUrD1eZes6GcXOyg65vvWGsQN/TsRVGg23WkFa/+lK6gT+/WwtlF1a bYrOJtNnmeJ+1145t9GbKNSzZP6huX6SiLFYD7O7ftMJX/aaJw9AitclwfUdMnM07LSZ DuVfgvEiijzDBFEeJhopV6dGj0Hgj3Qi340FJvKWZW4gCTjVjT/+WKwFz+TcIKAJSgK3 xctXeL/QQidBBaAgDC0xlkO3CR+0egY6cgi9cjP7Na1VC+7Ax4jcnAofm4TGR80VZ+cB LcVA== 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=R4Cpjv6inlPt59b2trc4OBPz3hcdQEI/km6vQmZ4dE8=; b=TBOBa8IzST+UgvzroT2KbJbGR/ghqtXPURYYVsVAcgSUpaaDB63jy5OoSTK8BK4RBG QflG1IxZSC28Szjsc/ZmLdC4QpcYFqv7tYZ3AuOv+wV9b/GH3PT3pDL0Pgy0fppywTWB 58kfyBhSXAjnWnq/c5MzPEwiQTQSdGYexhd5dEpJWVPlwfYtMch2aSDR4xSGtdVCGrlI J88yauy34y+Xkv0tvJ3JKIO9TBWB1UQYVUPB2JCPeseIbgjfMTZ7JSi1uVT7CQkuWg1h BD5datQik3CvTr9rlJL0Hiw/ZvGU2EZYpMXFD+2qPcqZTLTi/p6oSh60lUhr0IdwArTD wkUA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=engvtWoY; 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 y97si10995363ede.234.2020.07.20.09.45.23; Mon, 20 Jul 2020 09:45:23 -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=engvtWoY; 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 S1729854AbgGTQpU (ORCPT + 15 others); Mon, 20 Jul 2020 12:45:20 -0400 Received: from mail.kernel.org ([198.145.29.99]:33018 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729859AbgGTPlT (ORCPT ); Mon, 20 Jul 2020 11:41:19 -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 0655C2065E; Mon, 20 Jul 2020 15:41:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1595259678; bh=4F5ltSzsWVSxcuxanMxE12FRG4qg+lECWp25g442HZc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=engvtWoYSrhm+XvmupKTh2Gu9ZWGrFIAinCMUOcPolxtdl6jT6Dp73LqwxJsxmUaV Sxjye+ZTgc8XB3xiAu+g0ufa97lbwfINQXwCih4SZ54VgxHMnaWHP+bzub7zFYPHWt 7X0AmDVbLp6mqbM8Kgf04ba7HzNOLhBQy/xkLUNs= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Lars-Peter Clausen , Linus Walleij , Jonathan Cameron , Stable@vger.kernel.org Subject: [PATCH 4.9 41/86] iio:magnetometer:ak8974: Fix alignment and data leak issues Date: Mon, 20 Jul 2020 17:36:37 +0200 Message-Id: <20200720152755.232415653@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200720152753.138974850@linuxfoundation.org> References: <20200720152753.138974850@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 838e00b13bfd4cac8b24df25bfc58e2eb99bcc70 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 appart from previous readings. Fixes: 7c94a8b2ee8cf ("iio: magn: add a driver for AK8974") Reported-by: Lars-Peter Clausen Reviewed-by: Linus Walleij Signed-off-by: Jonathan Cameron Cc: Signed-off-by: Greg Kroah-Hartman --- drivers/iio/magnetometer/ak8974.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) --- a/drivers/iio/magnetometer/ak8974.c +++ b/drivers/iio/magnetometer/ak8974.c @@ -153,6 +153,11 @@ struct ak8974 { bool drdy_irq; struct completion drdy_complete; bool drdy_active_low; + /* Ensure timestamp is naturally aligned */ + struct { + __le16 channels[3]; + s64 ts __aligned(8); + } scan; }; static const char ak8974_reg_avdd[] = "avdd"; @@ -494,7 +499,6 @@ static void ak8974_fill_buffer(struct ii { struct ak8974 *ak8974 = iio_priv(indio_dev); int ret; - s16 hw_values[8]; /* Three axes + 64bit padding */ pm_runtime_get_sync(&ak8974->i2c->dev); mutex_lock(&ak8974->lock); @@ -504,13 +508,13 @@ static void ak8974_fill_buffer(struct ii dev_err(&ak8974->i2c->dev, "error triggering measure\n"); goto out_unlock; } - ret = ak8974_getresult(ak8974, hw_values); + ret = ak8974_getresult(ak8974, ak8974->scan.channels); if (ret) { dev_err(&ak8974->i2c->dev, "error getting measures\n"); goto out_unlock; } - iio_push_to_buffers_with_timestamp(indio_dev, hw_values, + iio_push_to_buffers_with_timestamp(indio_dev, &ak8974->scan, iio_get_time_ns(indio_dev)); out_unlock: