From patchwork Mon Jul 12 06:12:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 473061 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp2718150jao; Mon, 12 Jul 2021 01:17:12 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzsZMomAZENQnZAykLaHtTf1KDh8K6ymkp+JiOFVh2yrU05ogj9vSt96O/7IbxFYiacF1OS X-Received: by 2002:a17:906:744:: with SMTP id z4mr51873570ejb.347.1626077832423; Mon, 12 Jul 2021 01:17:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626077832; cv=none; d=google.com; s=arc-20160816; b=dTHaiD6bwqF5tYDKqEwxSd6TduR5o7qsfzQEDpATWTrcsBlXdz2JFcu2ZoS4V5L2dD MmzZTttbW1G0oVRyW2ceKjuI+WtT1gWO/90gUIyxMJPgOBZR89iKteqxdO8rXCHnrr0H L5iC307gU0cjgKNGdw5CVhwZe+dGs1YfoHFz/3frLMfvypFbENfrmNt2hLX7DMwPzvPA iwBcLwGuPCRpPg07hY0J3ZhF+v4aeTzReQxolf8lA+301z0HUPehpjYQOb0mE45xlyHR 9KGclm++nDIEz1T/dX2ibeJLEs9vh5I05DckmXfIwqj6MZCN8jHehFGPr18o7qUv0xlG GEkw== 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=URhc9y0JTbW13221WTbEj03HmYAXiwQKqRC5IAKwesc=; b=Zk+Dd/Y7aud3sOZeCvgZf84AoEEE6WqNseOfeCnPQgEEt2LXAMhQspns6h6KwBQzKu nM7V4b50w858X3lukGFkA29kfe+lYSpVSCSnpDQ7scSt4IHMK9KzcrQpHsFe4ocw4qHg 1cv0N/SWdQ/TwXGNzBATjYNzQQjKrebnE5jODDrgiXAFatZqrOpmhITAtPSqpH0eD55+ yKD7l/PFM7RCiZwUrfi6nRRzJNoiz7VUhXaL9szoj3+x5tyBo4K7AgU4fDlwTxcaL8pY W+T4BUyll3XL8pqK9B8xs3JqrN6U0fm9X4JxCvMNKDGDS99KVub3djJ904LUn8pvbGdU Jw3Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=oAQgtQyU; 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 n21si13642925eda.13.2021.07.12.01.17.12; Mon, 12 Jul 2021 01:17:12 -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=@linuxfoundation.org header.s=korg header.b=oAQgtQyU; 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 S231205AbhGLIK5 (ORCPT + 12 others); Mon, 12 Jul 2021 04:10:57 -0400 Received: from mail.kernel.org ([198.145.29.99]:54952 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1353740AbhGLICt (ORCPT ); Mon, 12 Jul 2021 04:02:49 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id BE02261D03; Mon, 12 Jul 2021 07:57:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626076631; bh=GwE8RPq5pMt2EPWshQUKIzJE5UeMVqs9MYiF1KNprCw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oAQgtQyUSWB6NHq653X2xAh8xsblBcrN/aj6jFFl/nsmPZ/39V8k+48SPtClCX/ks jvaqX944Y8QzdzBIzDoNzQYdYW9ale8/DXqjIWlDNo7Nfds8Z+QjEUXjjWQOutdWzc NETNnf/BC+1uUuxbzS4/SIn2R/4IXCWPNBDKn1gw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jonathan Cameron , Mathieu Othacehe , =?utf-8?q?Nuno_S=C3=A1?= , Sasha Levin Subject: [PATCH 5.13 726/800] iio: prox: isl29501: Fix buffer alignment in iio_push_to_buffers_with_timestamp() Date: Mon, 12 Jul 2021 08:12:29 +0200 Message-Id: <20210712061044.020070820@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210712060912.995381202@linuxfoundation.org> References: <20210712060912.995381202@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 [ Upstream commit 92babc9938ebbf4050f2fba774836f7edc16a570 ] Add __aligned(8) to ensure the buffer passed to iio_push_to_buffers_with_timestamp() is suitable for the naturally aligned timestamp that will be inserted. Here an explicit structure is not used, because the holes would necessitate the addition of an explict memset(), to avoid a kernel data leak, making for a less minimal fix. Fixes: 1c28799257bc ("iio: light: isl29501: Add support for the ISL29501 ToF sensor.") Signed-off-by: Jonathan Cameron Cc: Mathieu Othacehe Reviewed-by: Nuno Sá Link: https://lore.kernel.org/r/20210613152301.571002-9-jic23@kernel.org Signed-off-by: Sasha Levin --- drivers/iio/proximity/isl29501.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.30.2 diff --git a/drivers/iio/proximity/isl29501.c b/drivers/iio/proximity/isl29501.c index 90e76451c972..5b6ea783795d 100644 --- a/drivers/iio/proximity/isl29501.c +++ b/drivers/iio/proximity/isl29501.c @@ -938,7 +938,7 @@ static irqreturn_t isl29501_trigger_handler(int irq, void *p) struct iio_dev *indio_dev = pf->indio_dev; struct isl29501_private *isl29501 = iio_priv(indio_dev); const unsigned long *active_mask = indio_dev->active_scan_mask; - u32 buffer[4] = {}; /* 1x16-bit + ts */ + u32 buffer[4] __aligned(8) = {}; /* 1x16-bit + naturally aligned ts */ if (test_bit(ISL29501_DISTANCE_SCAN_INDEX, active_mask)) isl29501_register_read(isl29501, REG_DISTANCE, buffer);