From patchwork Mon Mar 4 09:55:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniil Dulov X-Patchwork-Id: 209473 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:fa17:b0:10a:f01:a869 with SMTP id ju23csp1322327dyc; Mon, 4 Mar 2024 02:05:02 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCWmwkEJXOErXTQ9gYIP3qU4RxjNgxYuhOmAp0jP0/VT1/9SewVqS95rsjsovRO93gbqleCi/NjTOrz8mogLMMdUj3mOIw== X-Google-Smtp-Source: AGHT+IHII5hQmu++DlAgtEGZhnBCdHjqvyWL3P2rDgDvDJOyAm3/xk3+/BEgNzAVXCN+DdOdCa25 X-Received: by 2002:a17:90b:911:b0:299:3e54:83f6 with SMTP id bo17-20020a17090b091100b002993e5483f6mr5778590pjb.7.1709546702635; Mon, 04 Mar 2024 02:05:02 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1709546702; cv=pass; d=google.com; s=arc-20160816; b=yKnjUBqTyDFVMj2Jt0tDT+Vx29jRwNqlBmWcg8QcLqJdPNJbDQLtlRcXysciPxVzML jFavxM1ph0hj+hHoMYY2TkDf11u+N66Ocb84dXFtlcPF97VER90gvc2TcJbBhUVGAaWW m6aLUiE/yzMJIgjWI5YqmEbDZWBMVABIWvu2dR36cz4ib1AiTM6N6KZ2PpB9U3uPMiPq EI5zPAptI2UDzRIewZyF3erHiuHXIacWYDiAXq/nspJCHxK8vPXu383JUUssbmW1x/0r 7G/EygKcLAmkzjeiaLua+MTB/ahhsYBO2RuIHwQlCXyN48obQ5TUDKIpMKAu6rtdIhb/ jK4Q== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from; bh=NZgvfbn4lOXB1ugQk465zjGLEOANII8knaiVavOSuAA=; fh=v+hfwmbQlbfDWRXtymWNKRgTnIySfMpwe2ymgqUCUK8=; b=ckY6VaIt1XWEmMQ2rzcFxNM3/BgtP/IwO8wl/gW2r6JT8PYfCVC/17UMfsKw8OVCdP hqAE2xmWZCYmWF6yjndKXubZ6ebJpMkCyrgke5XnePQsUB3ao84gKVeMEFxEF2GaFXP0 Jygn/z7WUUeJ2UaK7GqBTl6MyuqZqQrglRgCHcX1ZoBmvDR9LQeRBrdY39+eJiBvaH9l gAsk+iNgeH93JECWHl2GMc0A1oJj8oxwHJxrCYqRWzWLhp/ZkWeIQ7QBMB4dXloqI/zu pczee+urBTufUzfKsXKUhgJIhcP8sCzGKDQMNdCHHHk+LhT/1/E58NBDy93XC0Qs7w5v 8T8w==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; arc=pass (i=1 spf=pass spfdomain=aladdin.ru dmarc=pass fromdomain=aladdin.ru); spf=pass (google.com: domain of linux-kernel+bounces-90364-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-90364-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=aladdin.ru Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [2604:1380:40f1:3f00::1]) by mx.google.com with ESMTPS id cp6-20020a170902e78600b001dd129accb7si1392441plb.523.2024.03.04.02.05.02 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Mar 2024 02:05:02 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-90364-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1; Authentication-Results: mx.google.com; arc=pass (i=1 spf=pass spfdomain=aladdin.ru dmarc=pass fromdomain=aladdin.ru); spf=pass (google.com: domain of linux-kernel+bounces-90364-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-90364-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=aladdin.ru Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sy.mirrors.kernel.org (Postfix) with ESMTPS id DC6A6B2363D for ; Mon, 4 Mar 2024 09:57:15 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 22DD8225DE; Mon, 4 Mar 2024 09:56:17 +0000 (UTC) Received: from mail-out.aladdin-rd.ru (mail-out.aladdin-rd.ru [91.199.251.16]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9F10B249E6; Mon, 4 Mar 2024 09:56:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.199.251.16 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709546175; cv=none; b=EUbjb6sPTUcMcFvdTwH+A5HKBVSajVFxXKmkVkG1Vs5nTPZ/pT62N9IkMbQx0EuGFIKEYicZec+49RAZZxx65IYjZuIwkau1IN/Evm+IzaEEr7aYy5DitjlcFtHOnpeK+X3IQXr0q3sKPLJSmaVvAdLzz+4doiCDyvnfyOA9KHU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709546175; c=relaxed/simple; bh=lPMlhZe6Zu/FURCZR//Lp7oBo0dSFp8zW5k/9lO6GAk=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=D0nL3BLixh0opcXjWfE4Ix0HRYC1nBXZopoo4PkV7xGNsCGIosXBOrzNeLfG00I3NZaPQFoCQpqs7xElwMJtYpuWPi3D85JmsxxKq1Hubkhx6rAheMJlGQw6Wikjb7vLeV606/hI/VuAHxYJR6YEo5qyEB9o46gzH3xn1sLyNf4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=aladdin.ru; spf=pass smtp.mailfrom=aladdin.ru; arc=none smtp.client-ip=91.199.251.16 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=aladdin.ru Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=aladdin.ru From: Daniil Dulov To: Greg Kroah-Hartman , CC: Daniil Dulov , Vinod Koul , Bard Liao , Pierre-Louis Bossart , Sanyog Kale , , , , Ranjani Sridharan Subject: [PATCH 5.10/5.15/6.1 1/1] soundwire: stream: use consistent pattern for freeing buffers Date: Mon, 4 Mar 2024 12:55:42 +0300 Message-ID: <20240304095542.4799-2-d.dulov@aladdin.ru> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240304095542.4799-1-d.dulov@aladdin.ru> References: <20240304095542.4799-1-d.dulov@aladdin.ru> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: EXCH-2016-03.aladdin.ru (192.168.1.103) To EXCH-2016-01.aladdin.ru (192.168.1.101) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1792589165380755114 X-GMAIL-MSGID: 1792589643363471970 From: Pierre-Louis Bossart commit 5ec0c8721c06fc55d8a0bb32c403228358987eb6 upstream 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 Link: https://lore.kernel.org/r/20230119073211.85979-2-yung-chuan.liao@linux.intel.com Signed-off-by: Vinod Koul Signed-off-by: Daniil Dulov --- 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 a377c3d02c55..ecde6fcb8be0 100644 --- a/drivers/soundwire/stream.c +++ b/drivers/soundwire/stream.c @@ -703,8 +703,8 @@ static int sdw_bank_switch(struct sdw_bus *bus, int m_rt_count) } if (!multi_link) { - kfree(wr_msg); kfree(wbuf); + kfree(wr_msg); bus->defer_msg.msg = NULL; bus->params.curr_bank = !bus->params.curr_bank; bus->params.next_bank = !bus->params.next_bank; @@ -750,6 +750,7 @@ static int sdw_ml_sync_bank_switch(struct sdw_bus *bus, bool multi_link) if (bus->defer_msg.msg) { kfree(bus->defer_msg.msg->buf); kfree(bus->defer_msg.msg); + bus->defer_msg.msg = NULL; } return 0; @@ -847,6 +848,7 @@ static int do_bank_switch(struct sdw_stream_runtime *stream) if (bus->defer_msg.msg) { kfree(bus->defer_msg.msg->buf); kfree(bus->defer_msg.msg); + bus->defer_msg.msg = NULL; } }