[v2,1/3] tty: serial: samsung_tty: Fix a memory leak in s3c24xx_serial_getclk() in case of error
Message ID | e4baf6039368f52e5a5453982ddcb9a330fc689e.1686412569.git.christophe.jaillet@wanadoo.fr |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp1634246vqr; Sat, 10 Jun 2023 09:32:00 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6ZDa63E/hD6iLzscJZo4kEAlpcSKLVaDBfp4ecTO0Ps6jVhxXDiJ2Dt/qez1oXGSPaAi6M X-Received: by 2002:a17:902:e744:b0:1b2:6054:862d with SMTP id p4-20020a170902e74400b001b26054862dmr2863073plf.50.1686414719711; Sat, 10 Jun 2023 09:31:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686414719; cv=none; d=google.com; s=arc-20160816; b=m+7OVmcw7NHaFxO1vum4z0Rrk+k3eiAsdfd9U3UTdX4dN12Xs7zMyY1QdoM8PcDkvb 9KF10PMGGDqo77LlLY2xeJ+t0kIVaEwKK4coBa1NvuY5888ehIFnZblDf2CPPvoBx3f1 2OFGvRWRYynPsZ54IRwY7Fyik/aPWMApTMw43J3MR0Ungk4euf6P6nQ/Fs5GdoxJhIeT rqbIVTA4BTxyIBxv2NEp6qnRBefy2kc4hBYZNvTHwCLnEUnrUy9LMzjyXRpMq7xNfRdG xbW/+lK36rGJyfULtXD4/i1mWkbQDcFSR9LYqtXE+MkK3j/obGB0wDFt3VLsKOmTE5Ad SqNg== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=eYz8VPeFQqWxDk20aGLkAdXUCS+n+oiCg0u8zmpFgg4=; b=NtUHT+mavAkM/ycZez8AQOIkDJnvjPgfZ7oY9IMF2H22wZgjOSLZ6sjCG92bOdVZ/J p6uLWu9t6UuvTHEIjBrQkbBY+PxnSjkSrNChakzHnKC3e+AzP0Xaj6H+y8um+tks8bC/ DksoU8ZYv2uuogX49oAPAOrAfvZat0VG2UIAwgaT+pa4ZAL+NPzyS+XYNVhvjqtJ3XEr aGH8/+RE5f4Q+N7gAazLeiox2xU4AubAoSOf+B5D1fr4r0A+Emjf+zXIAAK1cfGJ7vrm rt9s9pUJ2LoHhgPLQW5vCZc5HPhqmSv7gTpZK4jHfTqCffN9t+zmYYigKu1YSXihkWli QyZg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@wanadoo.fr header.s=t20230301 header.b="E8Qj0/JL"; 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 b3-20020a170903228300b001b06fa47440si4583314plh.352.2023.06.10.09.31.46; Sat, 10 Jun 2023 09:31:59 -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="E8Qj0/JL"; 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 S232950AbjFJP7l (ORCPT <rfc822;rust.linux@gmail.com> + 99 others); Sat, 10 Jun 2023 11:59:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59488 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234767AbjFJP7j (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Sat, 10 Jun 2023 11:59:39 -0400 Received: from smtp.smtpout.orange.fr (smtp-14.smtpout.orange.fr [80.12.242.14]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 71C8430C0 for <linux-kernel@vger.kernel.org>; Sat, 10 Jun 2023 08:59:35 -0700 (PDT) Received: from pop-os.home ([86.243.2.178]) by smtp.orange.fr with ESMTPA id 80zwqFULNV4eY80zwqBQ53; Sat, 10 Jun 2023 17:59:31 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=wanadoo.fr; s=t20230301; t=1686412773; bh=eYz8VPeFQqWxDk20aGLkAdXUCS+n+oiCg0u8zmpFgg4=; h=From:To:Cc:Subject:Date; b=E8Qj0/JL7wXord7afU38rc3n79/MyJkTu9RoEy31bYmwu28ifvGXbl5BpuaZT3Hm0 ZMu2c2rh3BL9b0I7vv//Wxp/IycEhvrXU3HngRiLoVYhfdRS4UVqqggKwIuRjECb5M qExQpuOlxDeBnqha/k40ziJRbOn48aiXSx7qVz2fbXtvyyoexduy+oNBO0ul4uohHk GjAmEjtarIYSttr0kx2ITF2IR0sD8m6dSLaRYOfnLG8QsnVTIvb9dr/HQlBc7jUk76 vQEsrGwPow6A664QSjFgWUM5neBLeI39ZPl8k4qd4Z5cg1XuHQL5wRewPvRtwYw0Vd 8+NFaD1kuUBjA== X-ME-Helo: pop-os.home X-ME-Auth: Y2hyaXN0b3BoZS5qYWlsbGV0QHdhbmFkb28uZnI= X-ME-Date: Sat, 10 Jun 2023 17:59:31 +0200 X-ME-IP: 86.243.2.178 From: Christophe JAILLET <christophe.jaillet@wanadoo.fr> To: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>, Alim Akhtar <alim.akhtar@samsung.com>, Greg Kroah-Hartman <gregkh@linuxfoundation.org>, Jiri Slaby <jirislaby@kernel.org>, Thomas Abraham <thomas.abraham@linaro.org>, Kukjin Kim <kgene.kim@samsung.com> Cc: linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org, Christophe JAILLET <christophe.jaillet@wanadoo.fr>, stable@vger.kernel.org, Andi Shyti <andi.shyti@kernel.org>, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-serial@vger.kernel.org Subject: [PATCH v2 1/3] tty: serial: samsung_tty: Fix a memory leak in s3c24xx_serial_getclk() in case of error Date: Sat, 10 Jun 2023 17:59:25 +0200 Message-Id: <e4baf6039368f52e5a5453982ddcb9a330fc689e.1686412569.git.christophe.jaillet@wanadoo.fr> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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_H3,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: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1768334001049517635?= X-GMAIL-MSGID: =?utf-8?q?1768334001049517635?= |
Series |
[v2,1/3] tty: serial: samsung_tty: Fix a memory leak in s3c24xx_serial_getclk() in case of error
|
|
Commit Message
Christophe JAILLET
June 10, 2023, 3:59 p.m. UTC
If clk_get_rate() fails, the clk that has just been allocated needs to be freed. Cc: <stable@vger.kernel.org> # v3.3+ Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Reviewed-by: Andi Shyti <andi.shyti@kernel.org> Fixes: 5f5a7a5578c5 ("serial: samsung: switch to clkdev based clock lookup") Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> --- v2: Add an error message [Andi Shyti] Add Cc: stable [Andi Shyti] Add R-b tags v1: https://lore.kernel.org/all/e4359d5ef206f5b349c1d15a515a1205e78dda55.1686285892.git.christophe.jaillet@wanadoo.fr/ Slightly unsure if Krzysztof's R-b should be kept or not. v2 is not the same as v1, but the change looks small. Sorry if I did wrong. --- drivers/tty/serial/samsung_tty.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
Comments
On 10. 06. 23, 17:59, Christophe JAILLET wrote: > If clk_get_rate() fails, the clk that has just been allocated needs to be > freed. > > Cc: <stable@vger.kernel.org> # v3.3+ > Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> > Reviewed-by: Andi Shyti <andi.shyti@kernel.org> > Fixes: 5f5a7a5578c5 ("serial: samsung: switch to clkdev based clock lookup") > Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> Reviewed-by: Jiri Slaby <jirislaby@kernel.org> thanks,
diff --git a/drivers/tty/serial/samsung_tty.c b/drivers/tty/serial/samsung_tty.c index 2a7520ad3abd..a92a23e1964e 100644 --- a/drivers/tty/serial/samsung_tty.c +++ b/drivers/tty/serial/samsung_tty.c @@ -1459,8 +1459,12 @@ static unsigned int s3c24xx_serial_getclk(struct s3c24xx_uart_port *ourport, continue; rate = clk_get_rate(clk); - if (!rate) + if (!rate) { + dev_err(ourport->port.dev, + "Failed to get clock rate for %s.\n", clkname); + clk_put(clk); continue; + } if (ourport->info->has_divslot) { unsigned long div = rate / req_baud;