From patchwork Mon Jul 20 15:35:31 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: 237494 Delivered-To: patch@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp2113369ilg; Mon, 20 Jul 2020 09:08:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJznzYacgIrhhIR8fpNmti1R2j4Viegl6Mrh3aUuoZTdl3nRzwlgcVDiOQjvhepkRRkBEK5j X-Received: by 2002:a17:906:4b16:: with SMTP id y22mr21610323eju.4.1595261288727; Mon, 20 Jul 2020 09:08:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1595261288; cv=none; d=google.com; s=arc-20160816; b=UBRFJSZfaOM0CfmqhjyGZDsUGmdRiXwm1UxqZSxnRuQ1CskQe90s8HltaUBtwvGZn/ +kBVJ3cVIizI9qR1ExVRpkKn3uFetKZretQGFUswGZAZ+8nZ1p0yCGWwRFgq9Iz7qDqo SajhHmMcsR/BiMH3E3fNzHjoHiKVw6Tz1Zll75ocsH8BIozFnhg8Dz+JHPJAXPpF3Sql F6o7zPareFpInhRUPQTWR1XNL4293EAmrd+HuK+MZnRQmCnnvTowZVR1//nPaM+7f9pP vUj9G9fNeObfzXBDPmY/WB+oePla33w1GCSYrnu9YalQqoubhPTpzteTol9Fw+SWg/Ok 8gbg== 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=GUPYLs39yvW9dExfVoyDSN71ZYgfoawwxQIJUWhYVuQ=; b=mQgzP4e7fLwb2qW9957ajk+gO7EiusKHl5zoU+FUyWSegdB/M7TmAaNv5LV1qgQozG AOHNxtiDs6SloFU9sKhywgymlWz1l9FNmgPtjWlN//GCZkRuTT3UkuFax8dx3lapVb+H klEzcQn/WnBxqMedmwle1EMZj4n17OOaOWVLplaZTkRXC+gP7PloBiQeYoCf1+fR5s+C cE0jR0qgtLE052hggf+A8jvRszfQ7rcvp+ietGBl/k9ydJjVFWn4mkqqzjsKuEmyh+TU 6Ar3vVl6RysxZbkb1GBNozdRhVuctiaynecscsNHC9hYOqUV931RdOXxa8YV/jk93Iq3 wcJw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=hhZN90Z4; 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 t8si10740132ejs.72.2020.07.20.09.08.08; Mon, 20 Jul 2020 09:08:08 -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=hhZN90Z4; 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 S1732761AbgGTQIF (ORCPT + 15 others); Mon, 20 Jul 2020 12:08:05 -0400 Received: from mail.kernel.org ([198.145.29.99]:45328 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1733242AbgGTQIE (ORCPT ); Mon, 20 Jul 2020 12:08:04 -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 8891722CB1; Mon, 20 Jul 2020 16:08:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1595261284; bh=1CVY6Ixyfc3N1iXZi/C5GQOuWmGjDONCEAmLWXAlKvI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hhZN90Z4bjdwKvB/q8Yy4QOSwQivumx4NIPzLwzn0xotRvWsr64V21vF2+E4iqj4Y zHw3ltHooKjuWA7bQeqKoUQpDpXlGd6/dYc6o049XEcJ1JbH1hCx14iz16Yo3NltXL ddSJEl5pVKKAqzapeBnoxLzxvuiCiotR3YIVhYzQ= 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 5.7 060/244] iio:magnetometer:ak8974: Fix alignment and data leak issues Date: Mon, 20 Jul 2020 17:35:31 +0200 Message-Id: <20200720152828.711414923@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 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 @@ -185,6 +185,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"; @@ -581,7 +586,6 @@ static void ak8974_fill_buffer(struct ii { struct ak8974 *ak8974 = iio_priv(indio_dev); int ret; - __le16 hw_values[8]; /* Three axes + 64bit padding */ pm_runtime_get_sync(&ak8974->i2c->dev); mutex_lock(&ak8974->lock); @@ -591,13 +595,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: