From patchwork Mon Jul 19 14:50:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 479955 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp4244870jao; Mon, 19 Jul 2021 08:42:57 -0700 (PDT) X-Google-Smtp-Source: ABdhPJywwD1NWRHucxErxmrjudFmyoGy0u1eFe3UFykdpWEjt2PoNFytefFicy22JrDYOEefyULf X-Received: by 2002:a92:d98c:: with SMTP id r12mr18999030iln.304.1626709377849; Mon, 19 Jul 2021 08:42:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626709377; cv=none; d=google.com; s=arc-20160816; b=ZK8mhCAGtOf8r8VI6ZW4oqHPgcycJs0Ys+JyMmHr3cwdUoNog3A1tSAUVj03fAf1Gx IKkkWDhnixYuM2tpcOwTsUxNg0UHHOErNnDAQ4BRL6Kf0ofQHRpQhb7zQZIIzdQdYXrU M0+OmCh7eKImhO333aDNUL8Y/4NwCvOpx0qcOHbHrPAB9Cbm6Yrf4rfAs8LHqMLx8NEp LIBYXmvMMcl0QGSrU4FBeC30lX6O72any2zww98Y0/dD+aUqg5W0xsg7/mmbPvEJ1qh4 /zxuAlaellYkXsZHSZy1lCmBUGseKZWT8dswDV3fATvTHUCJ572C61lEkvu5bKizrI7A p+Bg== 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=R1m0p9ECD1VKtP1iHTIGCjkdk5u0rvHb3KjrHE+VuPw=; b=p+uzQgsJ9dDwSbNoGW8U+oDqKKr11gfA8nw2gUGnODUAww9+dP9mPFntRuRbw27San cBsJuuMOxmvCbNKjPful183Nzc181PgU2ipCuFbSHky3Sa/sMMaVprlx06xX9s5Pq/LF GaYnR+5vGgmBKN/9TClQgmDYZMWxikQQ9ZY8KKhI0HrqeEQ1HGID2hvrF/bzN/dHc6Hk ptheO2lcxdJrVf2BEo7Vu6EhYyID1Gzh4EEiMcCb44nmCiTganp4orUJM9RcdnfnozJm 7rv9D2UbHvWqNc63BEJUEkdY51YPW5uHwMDyVOCwfJjPwQsVZWgDorRyFRm962eIuOZu LiUg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=qdZnqAdI; 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 ay16si21406520jab.96.2021.07.19.08.42.57; Mon, 19 Jul 2021 08:42:57 -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=qdZnqAdI; 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 S245579AbhGSPCN (ORCPT + 12 others); Mon, 19 Jul 2021 11:02:13 -0400 Received: from mail.kernel.org ([198.145.29.99]:52768 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244227AbhGSO6n (ORCPT ); Mon, 19 Jul 2021 10:58:43 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 7991F613F8; Mon, 19 Jul 2021 15:36:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626708979; bh=6aQYi632XiykU/Wwde0KFpO+Dblrr6hqyTUGMrmWsn8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qdZnqAdIT0d+WJe2nrNHvlxTZ2z8b1OITmAbttfqu0kyJgNUHGNrp9b2+QE1Bp/OI 1eg19i5aJf49V3+bV4xA4rhaWyMiBDteFs+/v5ffLFCbj+28xk/8HMpSBBYl+JEt2P en48xaFthb7coUgzCDAtM8Z03w2mB7Z+L443UJLs= 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 4.19 206/421] iio: prox: isl29501: Fix buffer alignment in iio_push_to_buffers_with_timestamp() Date: Mon, 19 Jul 2021 16:50:17 +0200 Message-Id: <20210719144953.507591876@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210719144946.310399455@linuxfoundation.org> References: <20210719144946.310399455@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 e5e94540f404..a99d26023ef7 100644 --- a/drivers/iio/proximity/isl29501.c +++ b/drivers/iio/proximity/isl29501.c @@ -946,7 +946,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);