From patchwork Sat Jun 10 15:59:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe JAILLET X-Patchwork-Id: 105966 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp1625413vqr; Sat, 10 Jun 2023 09:13:11 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ41/3QjF7bGCcPqvOrTYN6lRiP8YadlxeOt9HF9QPYyFBUKdOGe7pFHu6U0X4KJQQ0iT6LQ X-Received: by 2002:a17:907:9308:b0:975:63f4:4b with SMTP id bu8-20020a170907930800b0097563f4004bmr5292893ejc.36.1686413590793; Sat, 10 Jun 2023 09:13:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686413590; cv=none; d=google.com; s=arc-20160816; b=lusPgomJxDCfLbwaS6sufvAjFfXbRjGkXlVUfW4jI70tOJX/yXDX7b4oS74TGE8a3z 6UbnuBwSjEEwQuC8gAS/jKZqAW7JsIa42j8lrsC5jyWsOCI2v3fJIwApk2Gnxqp0bSyr xoekf9L4Ro4elYNDQREXkH83kHK90SDKVsTOVu0eVUMFZBmfbF7JY6dvjkkowYDvFd2d w3Cy5KYaRum0I4kf9g3alj6qWWB0LrUcHlWnvGHqN/OhI5zWr35t9rTzSGD9JMPHM2X7 dKLi5WctgEPS1JRtMmxJ/0FdImZE86+YB/aLhmzL+rAeHzsmrzIQksFfsTaQzmrZJkRw wZAQ== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=rgPp2pCaELfgMWRAU3EmU6s0PWnLrCfx5I54gIqT2d4=; b=u2iKvuRqiJErKbdN6PYDOCQnH9sJ0aQKooRm/J0ZKPHEmsYXcme4jdx5XYPopxkEep MbzDquN3Jk4ryTGT0/4pTTenVyUK2hd8uxgMSdgWS/EJRRvZHbvJRfYjmFQcoT3GXzaS J5d9k7kdoUPaqedbLeZBvhO51oHqjQbUfLzLm2ByZJFYGoGJFO6r3eYGc+FYoWTdW1hY uT1XGIQFngi+CGCalw63Oi90JX1xG6D0JYKyM4lcUwO4eq+9bHIehEdHyXhKwYfgrC3h 2oCCHFNyOO6Ae4Oj3nLIwY6JDfWr7l+Tn0Wgm2tzfj34oRi4OApPkyPO0gh7XIGS1L5z aUGA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@wanadoo.fr header.s=t20230301 header.b=cDOdpzBo; 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id lc5-20020a170906f90500b00977cf84c426si2834409ejb.427.2023.06.10.09.12.44; Sat, 10 Jun 2023 09:13:10 -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=@wanadoo.fr header.s=t20230301 header.b=cDOdpzBo; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235746AbjFJP7u (ORCPT + 99 others); Sat, 10 Jun 2023 11:59:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59514 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235696AbjFJP7o (ORCPT ); Sat, 10 Jun 2023 11:59:44 -0400 Received: from smtp.smtpout.orange.fr (smtp-13.smtpout.orange.fr [80.12.242.13]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DE1E430C0 for ; Sat, 10 Jun 2023 08:59:42 -0700 (PDT) Received: from pop-os.home ([86.243.2.178]) by smtp.orange.fr with ESMTPA id 80zwqFULNV4eY8109qBQ5s; Sat, 10 Jun 2023 17:59:41 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=wanadoo.fr; s=t20230301; t=1686412781; bh=rgPp2pCaELfgMWRAU3EmU6s0PWnLrCfx5I54gIqT2d4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=cDOdpzBoF3bvokNC1MgJ44SiukpgXDu7b2i971OIkrmPMgiv4q3MS+0OIPNqkYG2W DbZDdZbQ8PPHSnqi6TgpnMDf0ALKVQ7De3YcCGtxKgB/Fb/saX4ij4Mm+dWthe2YeM 27EBBuf7tQz1DVgsWoC3wVfhlW+zcWn7KVjUkADyUA7XaDAerMaaYO1Jp4485iilQx Lpihc1DhbjzDcjJMwCduwy3HPVX3IJXdYQu+tI1fEhQOP2sRQ3JRxeOzfZ2oJAzyDQ fEUK9t6UMRt9bLiSwnUKpbNZczmJa4eehmY/H8PyNxjSZEifXdP3qi+IpwmGKVmRNb skhA+uAMYoiMQ== X-ME-Helo: pop-os.home X-ME-Auth: Y2hyaXN0b3BoZS5qYWlsbGV0QHdhbmFkb28uZnI= X-ME-Date: Sat, 10 Jun 2023 17:59:41 +0200 X-ME-IP: 86.243.2.178 From: Christophe JAILLET To: Krzysztof Kozlowski , Alim Akhtar , Greg Kroah-Hartman , Jiri Slaby , Kukjin Kim , Thomas Abraham Cc: linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org, Christophe JAILLET , stable@vger.kernel.org, Andi Shyti , linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-serial@vger.kernel.org Subject: [PATCH v2 2/3] tty: serial: samsung_tty: Fix a memory leak in s3c24xx_serial_getclk() when iterating clk Date: Sat, 10 Jun 2023 17:59:26 +0200 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=unavailable 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?1768332817520752359?= X-GMAIL-MSGID: =?utf-8?q?1768332817520752359?= When the best clk is searched, we iterate over all possible clk. If we find a better match, the previous one, if any, needs to be freed. If a better match has already been found, we still need to free the new one, otherwise it leaks. Cc: # v3.3+ Reviewed-by: Krzysztof Kozlowski Reviewed-by: Andi Shyti Fixes: 5f5a7a5578c5 ("serial: samsung: switch to clkdev based clock lookup") Signed-off-by: Christophe JAILLET Reviewed-by: Jiri Slaby --- I think that some clk_put() are also missing somewhere else in the driver but won't be able to investigate further. v2: No code change Add Cc: stable [Andi Shyti, as suggested for patch 1/2] Add R-b tags v1: https://lore.kernel.org/all/93bf8f574310256fcea50e5c5a62b5c37e20bb14.1686285892.git.christophe.jaillet@wanadoo.fr/ --- drivers/tty/serial/samsung_tty.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/tty/serial/samsung_tty.c b/drivers/tty/serial/samsung_tty.c index a92a23e1964e..0b37019820b4 100644 --- a/drivers/tty/serial/samsung_tty.c +++ b/drivers/tty/serial/samsung_tty.c @@ -1490,10 +1490,18 @@ static unsigned int s3c24xx_serial_getclk(struct s3c24xx_uart_port *ourport, calc_deviation = -calc_deviation; if (calc_deviation < deviation) { + /* + * If we find a better clk, release the previous one, if + * any. + */ + if (!IS_ERR(*best_clk)) + clk_put(*best_clk); *best_clk = clk; best_quot = quot; *clk_num = cnt; deviation = calc_deviation; + } else { + clk_put(clk); } }