From patchwork Mon Jul 12 06:12:28 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: 473060 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp2718136jao; Mon, 12 Jul 2021 01:17:11 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzK3BLROU1eJgqK8ukbYkqJ/InnbBnZnqk2Xj3x3wXqHgT0aZjYk9AglvgUdI+SlvL9bpZ8 X-Received: by 2002:a17:906:c14a:: with SMTP id dp10mr52862818ejc.426.1626077831031; Mon, 12 Jul 2021 01:17:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626077831; cv=none; d=google.com; s=arc-20160816; b=o8P0W/javGIgW5XKPavGU9wsSOmEq1x3lgxCJQ4M0ynOmzY106hLGVoWn+xiR4ArnC NlDEGnsGwJjjWOwb/v4YMdkW9Bo8+VaKHrIeE0jU2ja8LOjj3GLynS2whipypzvQoE+Y kL+SRgEKc7UowmUjNamYKNF2y2RfPLw/jx/vIJIXN8y9ZiMPbOtoJ5GzDdlDBlhC0LGX tH794TVGafBAAwOmTQQ5Uu20OAObuvzlJrjOOiRhV7Z/dmvoI8gViGTdPxYtsosHoNch G6Or7CJC0CN+OBSQZnBfWEbyorA8YBSdqsnXebVw9Rfq2SVZevq+mrVtWivRzn6LisLm Fk/Q== 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=yGLhM/wAjXumQSuvPGoLIeVwxpVQrcEglK00/QhR4MY=; b=e8xqTZ9Se93CxBDyESpGE7mpdnOYLYPVL9++YHtvLSFZkRI+G0kP3LPKjEdbCzckB9 lDvn+sPSDrPpbw7JHfUUNDqoXgOEsfVZ198WSejI+tHpI60qN9/JtqTFHZZrrnCFjVLK 4PoQGjxNWk7jmimkBVW9y3n7kQnP8z7mXTChvTo1yCPtLLXAABu+ERhhVVLzezfkTI8G epMClX+JKBBbJ/EJwyJAT6/jXckICX0gWUDdFal63jvtgSy2jaHNas/5CSX/qaZR+YAN M1hZO8RHi/2wOYstN1hoKAaJlyuuiaAR1o3Aid7pdK/J4nAcUSJCQ3LAVJ8ULyQli+UQ XdsA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=YxZaCnvk; 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.10; Mon, 12 Jul 2021 01:17:11 -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=YxZaCnvk; 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 S230522AbhGLIKx (ORCPT + 12 others); Mon, 12 Jul 2021 04:10:53 -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 S1353737AbhGLICt (ORCPT ); Mon, 12 Jul 2021 04:02:49 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 707BC61D02; Mon, 12 Jul 2021 07:57:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626076628; bh=O4BBMqK+kD5FFoG/NqaxRJbFS2HDj0SnTgGHmSYxk8c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YxZaCnvkVmyYkpaPOtWeV3lorkNKnse7DmhKCkEdaxznchA8UlBlo2/My1Fz7QKjV uJV1L7EdJQGzIKJpD761ECO0Mm4IXzFloESWD8LDcLR1Po1TLrPOJNfl0mlhtm9v73 kQ5Dk+XYS3GuB4DJ7IeHNK7XtRNatrdlvrIcW1To= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jonathan Cameron , Parthiban Nallathambi , =?utf-8?q?Nuno_S=C3=A1?= , Sasha Levin Subject: [PATCH 5.13 725/800] iio: light: vcnl4035: Fix buffer alignment in iio_push_to_buffers_with_timestamp() Date: Mon, 12 Jul 2021 08:12:28 +0200 Message-Id: <20210712061043.896020991@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 ec90b52c07c0403a6db60d752484ec08d605ead0 ] 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 potential kernel data leak, making for a less minimal fix. Fixes: 55707294c4eb ("iio: light: Add support for vishay vcnl4035") Signed-off-by: Jonathan Cameron Cc: Parthiban Nallathambi Reviewed-by: Nuno Sá Link: https://lore.kernel.org/r/20210613152301.571002-8-jic23@kernel.org Signed-off-by: Sasha Levin --- drivers/iio/light/vcnl4035.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- 2.30.2 diff --git a/drivers/iio/light/vcnl4035.c b/drivers/iio/light/vcnl4035.c index ae87740d9cef..bc0777411712 100644 --- a/drivers/iio/light/vcnl4035.c +++ b/drivers/iio/light/vcnl4035.c @@ -102,7 +102,8 @@ static irqreturn_t vcnl4035_trigger_consumer_handler(int irq, void *p) struct iio_poll_func *pf = p; struct iio_dev *indio_dev = pf->indio_dev; struct vcnl4035_data *data = iio_priv(indio_dev); - u8 buffer[ALIGN(sizeof(u16), sizeof(s64)) + sizeof(s64)]; + /* Ensure naturally aligned timestamp */ + u8 buffer[ALIGN(sizeof(u16), sizeof(s64)) + sizeof(s64)] __aligned(8); int ret; ret = regmap_read(data->regmap, VCNL4035_ALS_DATA, (int *)buffer);