From nobody Sun Sep 14 20:23:22 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id F3781C38142 for ; Thu, 19 Jan 2023 07:24:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229690AbjASHYD (ORCPT ); Thu, 19 Jan 2023 02:24:03 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38058 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229699AbjASHX5 (ORCPT ); Thu, 19 Jan 2023 02:23:57 -0500 Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 58AC8604A6 for ; Wed, 18 Jan 2023 23:23:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1674113026; x=1705649026; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=FoI5xBiRDitd9OHdi7JRneCz/iRwjpZBUD404jd4Zsg=; b=CLpMwzCXkqVzQc6+7AeR5ZNzgrMEbqPdP0JoYnd8xVjP3c6CdZ/hy9f0 CCPhUjJVVZtgm4sIxbUN3MyNFkRtd7DtaErVkkjl1yopRH7yI6Bkb0IgK A2IikTkPPL68Nyncn+oNCNSCBS/r2s/DLS1egX9qdDUq15rMFVhMYS3B1 qVRQzwP35glIlJp6a2KIfT8e2joe5vE0jYqUhQUjrvfgVhjLAsn5kNXyY xbyKS7QfCk15g7lRGhHmVGYk4NzbbJJKZeJrz3xp8z9aLI8HN1zBH6PcO UZUZO7Qy0LEySANDyzRqVoKTkm4efDGRVA4T6ZyNEkWQPK8zuouKejOBu Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10594"; a="322902664" X-IronPort-AV: E=Sophos;i="5.97,228,1669104000"; d="scan'208";a="322902664" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Jan 2023 23:23:45 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10594"; a="662028008" X-IronPort-AV: E=Sophos;i="5.97,228,1669104000"; d="scan'208";a="662028008" Received: from bard-ubuntu.sh.intel.com ([10.239.185.57]) by fmsmga007-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Jan 2023 23:23:38 -0800 From: Bard Liao To: alsa-devel@alsa-project.org, vkoul@kernel.org Cc: vinod.koul@linaro.org, linux-kernel@vger.kernel.org, pierre-louis.bossart@linux.intel.com, bard.liao@intel.com Subject: [PATCH v2 1/4] soundwire: stream: use consistent pattern for freeing buffers Date: Thu, 19 Jan 2023 15:32:08 +0800 Message-Id: <20230119073211.85979-2-yung-chuan.liao@linux.intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230119073211.85979-1-yung-chuan.liao@linux.intel.com> References: <20230119073211.85979-1-yung-chuan.liao@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Pierre-Louis Bossart The code should free the message buffer used for data, the message structure used for control and assign the latter to NULL. The last part is missing for multi-link cases, and the order is inconsistent for single-link cases. Link: https://github.com/thesofproject/linux/issues/4056 Signed-off-by: Pierre-Louis Bossart Reviewed-by: Ranjani Sridharan Signed-off-by: Bard Liao --- drivers/soundwire/stream.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/soundwire/stream.c b/drivers/soundwire/stream.c index df3b36670df4..9c13dbd2b26e 100644 --- a/drivers/soundwire/stream.c +++ b/drivers/soundwire/stream.c @@ -723,8 +723,8 @@ static int sdw_bank_switch(struct sdw_bus *bus, int m_r= t_count) } =20 if (!multi_link) { - kfree(wr_msg); kfree(wbuf); + kfree(wr_msg); bus->defer_msg.msg =3D NULL; bus->params.curr_bank =3D !bus->params.curr_bank; bus->params.next_bank =3D !bus->params.next_bank; @@ -769,6 +769,7 @@ static int sdw_ml_sync_bank_switch(struct sdw_bus *bus) if (bus->defer_msg.msg) { kfree(bus->defer_msg.msg->buf); kfree(bus->defer_msg.msg); + bus->defer_msg.msg =3D NULL; } =20 return 0; @@ -867,6 +868,7 @@ static int do_bank_switch(struct sdw_stream_runtime *st= ream) if (bus->defer_msg.msg) { kfree(bus->defer_msg.msg->buf); kfree(bus->defer_msg.msg); + bus->defer_msg.msg =3D NULL; } } =20 --=20 2.25.1