From patchwork Mon Jul 12 06:10:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 473050 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp2716459jao; Mon, 12 Jul 2021 01:14:44 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxr5byzG4/81PIra+8viCdZ0BGQYLWV6KGvR/fppmpwsbb9mumIPK7bgqUJM6I04W3sTwz9 X-Received: by 2002:a50:ed14:: with SMTP id j20mr58326080eds.271.1626077684769; Mon, 12 Jul 2021 01:14:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626077684; cv=none; d=google.com; s=arc-20160816; b=oelQ0h09wJDylTiyMaOzNT6mFms+z0Gt9R8g94Zqku9okEE1kMkTeZiCuj/ZRQCYyN E7S5TANtzmVN8tOYdO3FVTOvXC1Esz3KZA+GRBqPXrJBsjfkYJSnk+ssO7EDQrFOhHgc yNo1trCQ+LXt4yeXtdAOxqla+VuvKWUwqkMcWbY81AOTbsueu+7iEmqMhr1tE6M3q6sl y4SHxx3swbR17fILeKhLXtaYjTcWx1AWwUGxtK5dgXsM8b7KHwVxrw62KksH8WuvX7NM MurEcaCMihKsamT4PKHxIkG18b7ZrljfayOdfuheg/PDxuT8j9UWlBK2JOk2SoRUNyh0 +XHg== 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=KIg24tEiGpzQgiMM2TUKw5OUsZArY2l1nLG5U/3QkMM=; b=o5yodEd1sRbvT37CdLuIx4xNPlFDtsSMJMrMKHlwn7DI37nSIpQcXmCDReHZLa7Sfo XLR+3Fq0YImPDjkaw5T+4CE/B0mbjBWseab6Jn7piOauNVRRGpA/h/YizIfplkPwdoPA QQqbx3aqrSA8jaK+rH8GBK89m3jnL/lxcjd/IgercyvBo5s9bBdMZq/6u2Q5iKN6hzC1 +gXUvO47h6tvOpa77ts3dZS1YynUC6UdvaM9x08GAbHtfVtJ+qVBfcZaNozufyQks9Pj WBmIwIBOetqaEBIeiPmQKMK/fSTyVOBmwUzuT+lKRwtWutgpGSJQzTz1qGGYcxfemKfM 1cIA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=uj9CtqeN; 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.14.44; Mon, 12 Jul 2021 01:14:44 -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=uj9CtqeN; 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 S1355446AbhGLIJo (ORCPT + 12 others); Mon, 12 Jul 2021 04:09:44 -0400 Received: from mail.kernel.org ([198.145.29.99]:55946 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1353350AbhGLIBz (ORCPT ); Mon, 12 Jul 2021 04:01:55 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id E921761206; Mon, 12 Jul 2021 07:54:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626076480; bh=ZPvWtGw0c4LvyKMWE4H3jIhWYHrzlmLduWpQWw2PlPM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uj9CtqeNUS7Psqhcc1wUkEoUUpzTD0eN06pjw49vMiz+eW3d9/bAI4KNvPIXEOcJL l6GcNpryvYrnFp4d3EXpNmycgM/aReavJYgq7Nz7CtRa7i0wwEDUR0LImmyqOeau7+ FFH+DhZGIAmOngw2EQrYyd5GABw9zsHstFWxB3Ic= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jonathan Cameron , Srinivas Pandruvada , Andy Shevchenko , Sasha Levin Subject: [PATCH 5.13 618/800] iio: accel: hid: Fix buffer alignment in iio_push_to_buffers_with_timestamp() Date: Mon, 12 Jul 2021 08:10:41 +0200 Message-Id: <20210712061033.065988828@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 c6559bf796ccdb3a0c79db846af96c8f7046880b ] To make code more readable, use a structure to express the channel layout and ensure the timestamp is 8 byte aligned. Note this matches what was done in all the other hid sensor drivers. This one was missed previously due to an extra level of indirection. Found during an audit of all calls of this function. Fixes: a96cd0f901ee ("iio: accel: hid-sensor-accel-3d: Add timestamp") Signed-off-by: Jonathan Cameron Cc: Srinivas Pandruvada Reviewed-by: Andy Shevchenko Link: https://lore.kernel.org/r/20210501170121.512209-4-jic23@kernel.org Signed-off-by: Sasha Levin --- drivers/iio/accel/hid-sensor-accel-3d.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) -- 2.30.2 diff --git a/drivers/iio/accel/hid-sensor-accel-3d.c b/drivers/iio/accel/hid-sensor-accel-3d.c index 2f9465cb382f..27f47e1c251e 100644 --- a/drivers/iio/accel/hid-sensor-accel-3d.c +++ b/drivers/iio/accel/hid-sensor-accel-3d.c @@ -28,8 +28,11 @@ struct accel_3d_state { struct hid_sensor_hub_callbacks callbacks; struct hid_sensor_common common_attributes; struct hid_sensor_hub_attribute_info accel[ACCEL_3D_CHANNEL_MAX]; - /* Reserve for 3 channels + padding + timestamp */ - u32 accel_val[ACCEL_3D_CHANNEL_MAX + 3]; + /* Ensure timestamp is naturally aligned */ + struct { + u32 accel_val[3]; + s64 timestamp __aligned(8); + } scan; int scale_pre_decml; int scale_post_decml; int scale_precision; @@ -245,8 +248,8 @@ static int accel_3d_proc_event(struct hid_sensor_hub_device *hsdev, accel_state->timestamp = iio_get_time_ns(indio_dev); hid_sensor_push_data(indio_dev, - accel_state->accel_val, - sizeof(accel_state->accel_val), + &accel_state->scan, + sizeof(accel_state->scan), accel_state->timestamp); accel_state->timestamp = 0; @@ -271,7 +274,7 @@ static int accel_3d_capture_sample(struct hid_sensor_hub_device *hsdev, case HID_USAGE_SENSOR_ACCEL_Y_AXIS: case HID_USAGE_SENSOR_ACCEL_Z_AXIS: offset = usage_id - HID_USAGE_SENSOR_ACCEL_X_AXIS; - accel_state->accel_val[CHANNEL_SCAN_INDEX_X + offset] = + accel_state->scan.accel_val[CHANNEL_SCAN_INDEX_X + offset] = *(u32 *)raw_data; ret = 0; break;