From patchwork Mon Oct 24 11:30:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 8612 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp419931wru; Mon, 24 Oct 2022 05:17:14 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4SQitpvDQM56brGcwjASTgFoIWFG5BEHuLnKxFQeSsLit22N3ZylI7woqPW+D9aNWATxDY X-Received: by 2002:a05:6402:5cb:b0:452:e416:2bc4 with SMTP id n11-20020a05640205cb00b00452e4162bc4mr30074957edx.114.1666613834359; Mon, 24 Oct 2022 05:17:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666613834; cv=none; d=google.com; s=arc-20160816; b=cjazkdkJMEUQH+9wwt8xSgrhDMf7UcUIgRVQdEW2U6JRZQV/Ayni4+HzGfumM+68TP hNEXz6irvHo3KRBNF4XB+jYBb4ygL/+c+OmWr+l4i14g6585pW4/q+V1xL7nP5RUvJ1g ZkCY5hztcs4MFzPKujnGt3Rnkz6r/06bCmiR3kGzrLWjZXR70opN3JBnCLqr9YrjWyKz CNfTd7zJscEo35PoRzmB3CKM175bna4PETsdTsJgw4rNustxRYmjYTS1egMgIRhBtW0F AkU7WWGAPEWBJkU8EoBf6ATwIDiBxhCNzH9p04DKSHoNQkpLxpplDR70mwCsTkzFOBLe pOGg== 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=jhClmv/4OFgRakic9tvTLB6c0xJfsOQdZuerEksrzJw=; b=0zlkRS06lAbsOgy5ZpVmZDNNs716FDOGxvonnavU0Q62ihzbwPmo89B3L5jFGcylaU WWbD5ZJsUk/POSbnazWhOOXeIyKWcO6PB3OsisNexyvTsZi7w/eRJD9X4C25sEk4rVrK WGb8OlXG94nVQ97CXu3aaBKY4Afcn3LriuZVAvEfoVATDkWuoOplCxvJwCvkq48Y3hAP TSDxjDIT9ZV2YaU+iqOZbyhS2XHfJ7OA9rWqDoUScURBogsGVvqMFeH2XXnoEKGMNrsS BR5fCBeE7+hnFIyh3Q95BjNmt6HQ7Hv7muyci00tHhUg/LbLs7XPkpymsn+s97i3Wk82 f64w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=i1S+8W9D; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id hg7-20020a1709072cc700b0078e1216fb07si14331153ejc.558.2022.10.24.05.16.50; Mon, 24 Oct 2022 05:17:14 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=i1S+8W9D; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-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 S230164AbiJXMKV (ORCPT + 99 others); Mon, 24 Oct 2022 08:10:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38716 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232831AbiJXMI7 (ORCPT ); Mon, 24 Oct 2022 08:08:59 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A27777E036; Mon, 24 Oct 2022 04:52:19 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 3158CB811A1; Mon, 24 Oct 2022 11:51:15 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7FABEC433B5; Mon, 24 Oct 2022 11:51:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666612273; bh=bZwGPZDTogpLUxzxQ5yHMwfGBVlcNdR2myoMTG7FLZA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=i1S+8W9DTxoUU0Q+1mQATXu0c0KULHHXi5G2Qah1lXHWsTyqYCb0Zq1vtevwZgXDW uGAzvxbHDbX6RSdOTGGgVzV/luUw8JPOXiyPBrL2yu8JjHoYniEYQYJEkzZs2Rd47x N7ISjJC1w+maDC5ylLQ9HvPnOKIVsiaBgMJBN6G0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Andreas Pape , Eugeniu Rosca , Takashi Iwai , Sasha Levin Subject: [PATCH 4.14 104/210] ALSA: dmaengine: increment buffer pointer atomically Date: Mon, 24 Oct 2022 13:30:21 +0200 Message-Id: <20221024113000.387398401@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024112956.797777597@linuxfoundation.org> References: <20221024112956.797777597@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747571268276388509?= X-GMAIL-MSGID: =?utf-8?q?1747571268276388509?= From: Andreas Pape [ Upstream commit d1c442019594692c64a70a86ad88eb5b6db92216 ] Setting pointer and afterwards checking for wraparound leads to the possibility of returning the inconsistent pointer position. This patch increments buffer pointer atomically to avoid this issue. Fixes: e7f73a1613567a ("ASoC: Add dmaengine PCM helper functions") Signed-off-by: Andreas Pape Signed-off-by: Eugeniu Rosca Link: https://lore.kernel.org/r/1664211493-11789-1-git-send-email-erosca@de.adit-jv.com Signed-off-by: Takashi Iwai Signed-off-by: Sasha Levin --- sound/core/pcm_dmaengine.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/sound/core/pcm_dmaengine.c b/sound/core/pcm_dmaengine.c index 8eb58c709b14..6f6da1128edc 100644 --- a/sound/core/pcm_dmaengine.c +++ b/sound/core/pcm_dmaengine.c @@ -139,12 +139,14 @@ EXPORT_SYMBOL_GPL(snd_dmaengine_pcm_set_config_from_dai_data); static void dmaengine_pcm_dma_complete(void *arg) { + unsigned int new_pos; struct snd_pcm_substream *substream = arg; struct dmaengine_pcm_runtime_data *prtd = substream_to_prtd(substream); - prtd->pos += snd_pcm_lib_period_bytes(substream); - if (prtd->pos >= snd_pcm_lib_buffer_bytes(substream)) - prtd->pos = 0; + new_pos = prtd->pos + snd_pcm_lib_period_bytes(substream); + if (new_pos >= snd_pcm_lib_buffer_bytes(substream)) + new_pos = 0; + prtd->pos = new_pos; snd_pcm_period_elapsed(substream); }