From patchwork Mon Jul 12 06:12: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: 473054 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp2717218jao; Mon, 12 Jul 2021 01:15:49 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzrUUoHYGwTVTWmm6k7Xo7ghnuhoRzukHer8fX//AjXsSumpYzDBXduonDfeMEvMuxDmnfo X-Received: by 2002:a17:907:72c9:: with SMTP id du9mr36523825ejc.497.1626077749446; Mon, 12 Jul 2021 01:15:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626077749; cv=none; d=google.com; s=arc-20160816; b=PAMg3GUeMye2g8DHdy/HA+srSvqc7JsQq6GnizAbq7ljJWPI44cNtXQ2tblWDZysEc olgXAcBK0CQbDSJ9+vzsm4dXCvVBLyIPmYAu6l/uoKKwK4kU9SLO1es4aAKaMyQO1cOJ Ah2eG5a8PL49Q5OOiawKUyan7O9Oa1vigpXDrYA7A5WycR46fLWAWPTCq7U8K1a5ap5U Mb+CoJdh8iAKJyJvy45viN1Fp0xZ3UbBcIe5Yw+d5HzLg28gq/cREvtXA2u76sfBWO3j GBO2Bnes3j5aZwZHsttMxmE7Sd2NzIhLR3RLLV3vv78LwV9ya9HxdFTCfjUrrBThXc5V YNrg== 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=4PHbK/0C9z5stIN0Fn8vXcx+6jU//pkJD1QpfyHkBTI=; b=FimtmfIJf+f1fXhqWzbBaKXejvCXeB6sZc7sB+CEJG924N3t3wBDLQW91LJnbRVQZb sObwbD9l7bRQmX9oPTeKKAIST/fe82U8WvVcnSw/gUce4G9O3/0BT1DQFB+NjE4jrzYC N+7ehSxm+Yd5DYMIWD3YQSJJhS8iAFk4C+CqYv6OOdkNsQYIicNG2DKFzMoigu2Jxh+d 5Fs0MmssMlbBOWktD0cty6RAGH+kCxxTA6bpMsLKw7lZxM8+MTqiBSYosx+LbVWK3ilq 5ED9gwEiQtdd1vqonOYEjGN//cTRxdeYfc694EazducfWmUSQ+5WJRGVOcffjONXz4PT H/cQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=KQVc5M1X; 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.15.49; Mon, 12 Jul 2021 01:15:49 -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=KQVc5M1X; 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 S1355724AbhGLIKR (ORCPT + 12 others); Mon, 12 Jul 2021 04:10:17 -0400 Received: from mail.kernel.org ([198.145.29.99]:56658 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1353649AbhGLICo (ORCPT ); Mon, 12 Jul 2021 04:02:44 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id B002161628; Mon, 12 Jul 2021 07:56:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626076601; bh=+TWCa/1EP/i47iU9MzyDA5w9btZJIJAT8zhNTtxO/7s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KQVc5M1XdE5XHamr8TBHHgAUISEKbfsJwATwaHgpAl9TGF+keA3RUlKtL+u8HTOa4 rv28e3Lj7yvdew4tk258ACMy6r1aDJzA82wPJpvdq1f4ZvPpqFIqvgK7auUo/4XQok pdEcWrP+NttvxS8WS2edrjJFuNKQRma4y+cD/kTI= 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 714/800] iio: light: vcnl4000: Fix buffer alignment in iio_push_to_buffers_with_timestamp() Date: Mon, 12 Jul 2021 08:12:17 +0200 Message-Id: <20210712061042.712590433@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 dce793c0ab00c35039028fdcd5ce123805a01361 ] 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. Found during an audit of all callers of iio_push_to_buffers_with_timestamp() Fixes: 8fe78d5261e7 ("iio: vcnl4000: Add buffer support for VCNL4010/20.") Signed-off-by: Jonathan Cameron Cc: Mathieu Othacehe Reviewed-by: Nuno Sá Link: https://lore.kernel.org/r/20210613152301.571002-7-jic23@kernel.org Signed-off-by: Sasha Levin --- drivers/iio/light/vcnl4000.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.30.2 diff --git a/drivers/iio/light/vcnl4000.c b/drivers/iio/light/vcnl4000.c index 2f7916f95689..3b5e27053ef2 100644 --- a/drivers/iio/light/vcnl4000.c +++ b/drivers/iio/light/vcnl4000.c @@ -910,7 +910,7 @@ static irqreturn_t vcnl4010_trigger_handler(int irq, void *p) struct iio_dev *indio_dev = pf->indio_dev; struct vcnl4000_data *data = iio_priv(indio_dev); const unsigned long *active_scan_mask = indio_dev->active_scan_mask; - u16 buffer[8] = {0}; /* 1x16-bit + ts */ + u16 buffer[8] __aligned(8) = {0}; /* 1x16-bit + naturally aligned ts */ bool data_read = false; unsigned long isr; int val = 0;