From patchwork Mon Jul 20 15:36:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 237553 Delivered-To: patch@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp2138546ilg; Mon, 20 Jul 2020 09:38:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxM48dn8KEzu9Eg0++f4dIsKLikr9bjk0SEWT5p3eGwL6YgjGcFXAJaz6g39MvJzIIbqEX7 X-Received: by 2002:a17:907:11db:: with SMTP id va27mr22540603ejb.175.1595263104550; Mon, 20 Jul 2020 09:38:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1595263104; cv=none; d=google.com; s=arc-20160816; b=uVo/I8mirYceGNBhk3AYyyDsNHZ8XiB7078SHZBcCEbGcc0HajG6zlmMaHCqLw9mRi n9/MKPkxWd7i1FyReCY9Y9usuNB4kZAULlj2Rud0fGZ6+ZOEWbEm0ZxAl+CO0wRjM88p QnQ/ISTsbuN0IUUYz2BIJqmjGOVs39b5ylMzoFmXi0wHAmXb2wXWPT2KgGNTiEjgjoNs uW3197U0O354/qrlQXa/VdC6U8Vztcb58jIXtqeBMTkslrGIBDf/YKd+R6A2PYMhjEdH TvI4tJzcZyEK2GGRafbOcrX90QNK5P/VFNeXVoB4OyOMmcMoyedMTpirOsVgD1jqkZ/B 65pg== 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=eQtVbe6znlR9R7VfItITVGcijKYjgJKGnecMY/Ga6Yo=; b=X7NUwvMav2+X4Yl65KlYwgkSYSJAuomjqPBdRrXOOo6nZ3zi7wsI0gAhvq0aLy6w9M zb4Xksb1lAo12YR0I6BYzMtxhJAiquplElTU8gxrl+WpOk1bUXqZGWbV4Qq2xkcH2nko uKjLzfe07K+0x5JQczX3E52qXz5G6vRqRiWvkAI9MHHQR+KHeYDXQ++rzatNfik5sKqP 4Xb2/NkmoOVRllQUutohjsBr2gvbGKckwEKzzG29zt0a253JynuS4wekxfk0cdUYQ7nn S0ys5BIlfKTlQFzoWVWtE3zYTDU/sAsudRfSRrI5J91M65xxyNaTzmvPNO+2i5ULbFPE WTOA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="OfPqu1/l"; 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 v22si9699342ejf.411.2020.07.20.09.38.24; Mon, 20 Jul 2020 09:38:24 -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="OfPqu1/l"; 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 S1730497AbgGTPuk (ORCPT + 15 others); Mon, 20 Jul 2020 11:50:40 -0400 Received: from mail.kernel.org ([198.145.29.99]:47168 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730427AbgGTPug (ORCPT ); Mon, 20 Jul 2020 11:50:36 -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 7A05E2065E; Mon, 20 Jul 2020 15:50:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1595260235; bh=CxX0AJT363wpSILQqMtjxZO6oSEWTDFfl6+P8HsqE2E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OfPqu1/lkxImMUtDcILKydIZqAw2jbCc2P4E+35QVh+wpaeqD7l1YKlebroLVpFEl HiD1gFYdP/sDTt8K9KtPxMldnSMm4CHvoGjEoLcsUseMy+nxYxGNm5WQctqijY4/3t UrN92q7xlZlSeBMSNutLnXrc09kIGK3NsFaOijUk= 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.19 029/133] iio:magnetometer:ak8974: Fix alignment and data leak issues Date: Mon, 20 Jul 2020 17:36:16 +0200 Message-Id: <20200720152805.143300701@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200720152803.732195882@linuxfoundation.org> References: <20200720152803.732195882@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 @@ -184,6 +184,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"; @@ -580,7 +585,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); @@ -590,13 +594,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: