From patchwork Mon May 31 13:13:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 450505 Delivered-To: patch@linaro.org Received: by 2002:a02:c735:0:0:0:0:0 with SMTP id h21csp869634jao; Mon, 31 May 2021 07:16:19 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwCRkyD23E0GGDab005NeVc+cLit/mVPpOhrk7KQhHCCqzpofStC9mxXm1f2Nw7ucCtmYhE X-Received: by 2002:a17:907:b09:: with SMTP id h9mr22151514ejl.430.1622470579626; Mon, 31 May 2021 07:16:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1622470579; cv=none; d=google.com; s=arc-20160816; b=XViRGNJQSTFzV7YZvMm97QICx4lZ6kmNTtMx785xpcXqPF5kBJIiJJ5vwTewGbhrO/ TMtvlsePPn6LAEOTgIcADTRqD54R7+xypbPG56hEsrIlGoJ5SFD6WcfHyF9i/YTBXkVZ RoqsIMxKyreIv8nOCZ7PTPW32LjkFbRb7sQbe6E4lyalfpDv44ghop96ofjkiTf4WJFI 5poselHYD0DcnV1oL9UowCW03G7nkv/3fgr297sSdQClWTbdGVjkeh+OEBgMMVaGMhpW UGt0giyVmuklt22phK28lwUCOPdqHFxlLiskW+85HDz1G6WnPMIYiXLb7BtWyDRvBs6y WG8Q== 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=Eram04ylJh5hftvFG/cy6AlclZVApUGHdcju+MYDgL4=; b=n1e4h57qh/gw6v3eawt/AFDOMUz334FstU0yZfh60KDPSRRb9/w0C38yjskTNiAGSO 8r0fbLSXUjC9pBacWvtthLpsqU6/3SWwcwCt/W+JkpV0s2Fb4T+HEmkqWtUjz+GObyB2 76iRhueG3R7TnMcOp0eV6Ht1VuGGICNi022UBsJug4kh0DPJYD8JB+9ISPsm8kZsBYwc wQvus73FWy3vYNv3eJ34KS4rV7qaMp0rB/3a+HjXT08DQEiQN64M5E599hbIxnU+SNxo BnlZ1BPKYV75aj6OLN0qrrpn8w933r50vN4PuM3wE6tEJsHa53uc+NaNEkDaWrPckD1s MdsQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=WSODk3Lq; 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 y9si9695198edd.548.2021.05.31.07.16.19; Mon, 31 May 2021 07:16:19 -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=WSODk3Lq; 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 S233416AbhEaOR5 (ORCPT + 12 others); Mon, 31 May 2021 10:17:57 -0400 Received: from mail.kernel.org ([198.145.29.99]:43520 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233832AbhEaOPu (ORCPT ); Mon, 31 May 2021 10:15:50 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 4BCD16199E; Mon, 31 May 2021 13:43:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1622468583; bh=piYdyNL1WQOyltnBpIV83mNDkIEQloyOxsth3vJvFG8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WSODk3LqPvQh1V4jbyAsqqVdc27eDN2ScWzhGh8dT58h24wx1LNPAfKR5cI0NN/AT kDIyWKa6rY1x2JYheCWywFTD6SsTIXBYlEwhL8L2Wep2RMHQ/rdVkvysRpurrEbyrt RSt6HZRzWuwOkCrg/Ab2hAy9UsqxcSLxzdElr+hQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jonathan Cameron , Andy Shevchenko , Stable@vger.kernel.org Subject: [PATCH 5.4 045/177] iio: adc: ad7768-1: Fix too small buffer passed to iio_push_to_buffers_with_timestamp() Date: Mon, 31 May 2021 15:13:22 +0200 Message-Id: <20210531130649.469463176@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210531130647.887605866@linuxfoundation.org> References: <20210531130647.887605866@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 commit a1caeebab07e9d72eec534489f47964782b93ba9 upstream. Add space for the timestamp to be inserted. Also ensure correct alignment for passing to iio_push_to_buffers_with_timestamp() Fixes: a5f8c7da3dbe ("iio: adc: Add AD7768-1 ADC basic support") Signed-off-by: Jonathan Cameron Reviewed-by: Andy Shevchenko Link: https://lore.kernel.org/r/20210501165314.511954-2-jic23@kernel.org Cc: Signed-off-by: Greg Kroah-Hartman --- drivers/iio/adc/ad7768-1.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) --- a/drivers/iio/adc/ad7768-1.c +++ b/drivers/iio/adc/ad7768-1.c @@ -166,6 +166,10 @@ struct ad7768_state { * transfer buffers to live in their own cache lines. */ union { + struct { + __be32 chan; + s64 timestamp; + } scan; __be32 d32; u8 d8[2]; } data ____cacheline_aligned; @@ -459,11 +463,11 @@ static irqreturn_t ad7768_trigger_handle mutex_lock(&st->lock); - ret = spi_read(st->spi, &st->data.d32, 3); + ret = spi_read(st->spi, &st->data.scan.chan, 3); if (ret < 0) goto err_unlock; - iio_push_to_buffers_with_timestamp(indio_dev, &st->data.d32, + iio_push_to_buffers_with_timestamp(indio_dev, &st->data.scan, iio_get_time_ns(indio_dev)); iio_trigger_notify_done(indio_dev->trig);