From patchwork Fri Jun 9 04:45:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe JAILLET X-Patchwork-Id: 105270 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp714736vqr; Thu, 8 Jun 2023 21:59:47 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4/wnyjag+kW9dv8DfzFbdDzSVRGT7bY8Wtdj/OGrPvv0P+8QGT1fCTWZU9AL4MV2ho1iWy X-Received: by 2002:a17:90b:34c:b0:255:614a:7fae with SMTP id fh12-20020a17090b034c00b00255614a7faemr391591pjb.20.1686286787241; Thu, 08 Jun 2023 21:59:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686286787; cv=none; d=google.com; s=arc-20160816; b=p8wJP0zSa/UrqRlUbNpvd+/yW9Y2JFgvjlmlIa0DTEXmsXWYcSdU3/ZrviL5CZgU2s L0HD4c/Q980Jq7lvG5boXf7eP+iLPnHsgh6QOAOaUxfrf2jj4guLSw9/sh3wxv0ualjT Lidx9O4biZFR/RjgGZwz88LvzLUx4e7LcQrqHT8ZvyI6GQwyiH8ZXyyqvlG43WSo5I19 oIArP0zXr6NUMI1+BlqpkoLVHK/2SyvXuUIdN+n5203WcMIjd39UvdvLAx2yv2f14IT0 vOkBvb3mrPreajhFHKakBS1mD6PlcrydE1zL55tX1UrroVm4APOpiQsKal7un3+IiT4I zr2Q== 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=UkPuf1cEggfUhF63kQO/8xolTLGbzwLNxFq6qhE7R0c=; b=xmVVnooyRw1VpjNFPtgCau9+mOLAZpECRpPbfypMnLpzoZIhbzCMJwBr24AaY/A56q IOfURU5xGcpflNEKsHaBiZjrt6yi1T+GWZVE3BWcIFYLvt5yoTrZBkHg9YvN4sHaB97h aCrwJtgXdUQcr4r7+4JT275bgWpukLyRVFDKiMlg5OfTIQI6l0T95T560OtL4HfUDjTe F7jCqWwt4GkU7itk+Twssuj+CzWKzS96IJ8/m5qT2oTIM2KQpoLdlMVcpgiSv2R/jNoU wJcifr3y32jtOuArGbF0W2uUUXdZmY0m3bMFDN06ZYkVJX0LFlR3d0RmuAnnEkWqnsK4 tS/A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@wanadoo.fr header.s=t20230301 header.b=ID8zcjZT; 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 h16-20020a17090adb9000b002507cbb009bsi3822232pjv.112.2023.06.08.21.59.32; Thu, 08 Jun 2023 21:59:47 -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=ID8zcjZT; 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 S236492AbjFIEpw (ORCPT + 99 others); Fri, 9 Jun 2023 00:45:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48718 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234505AbjFIEpt (ORCPT ); Fri, 9 Jun 2023 00:45:49 -0400 Received: from smtp.smtpout.orange.fr (smtp-19.smtpout.orange.fr [80.12.242.19]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 934D830ED for ; Thu, 8 Jun 2023 21:45:45 -0700 (PDT) Received: from pop-os.home ([86.243.2.178]) by smtp.orange.fr with ESMTPA id 7U0KqPBjCDGHG7U0Kq4YGn; Fri, 09 Jun 2023 06:45:43 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=wanadoo.fr; s=t20230301; t=1686285943; bh=UkPuf1cEggfUhF63kQO/8xolTLGbzwLNxFq6qhE7R0c=; h=From:To:Cc:Subject:Date; b=ID8zcjZT9VNLSLnTBfTRFr7XdAJhLgGQQTZmuTkb8ZRx1I4puHUr3FQjEy9dizrt1 +7adlgaC23iIECotO7NMgpk6j7KCOEfm3jRftQprT2A53sWY5bt3RaOketL6bUfAD5 VOxq1Q2AFB7OXRMufd0PVN3LlKc8Txd1YBW/wQFCGRaf4qVdgn5ZhNXIF/jJ+50DOs ghNrWe8JWisDPa66b89R+/ZFNK6uBEpAARxgn5xwkfxV0+Ap9z+ileXfnpMkWSPSOs x8NPJdeXGHRNnDwW6n8G+sRF44HeyZkdQwJDEnTF16cnPXLuz922jTX7m+hoJxBYOs Cc0p82GxdZrEQ== X-ME-Helo: pop-os.home X-ME-Auth: Y2hyaXN0b3BoZS5qYWlsbGV0QHdhbmFkb28uZnI= X-ME-Date: Fri, 09 Jun 2023 06:45:43 +0200 X-ME-IP: 86.243.2.178 From: Christophe JAILLET To: Krzysztof Kozlowski , Alim Akhtar , Greg Kroah-Hartman , Jiri Slaby , Thomas Abraham , Kukjin Kim Cc: linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org, Christophe JAILLET , linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-serial@vger.kernel.org Subject: [PATCH 1/2] tty: serial: samsung_tty: Fix a memory leak in s3c24xx_serial_getclk() in case of error Date: Fri, 9 Jun 2023 06:45:38 +0200 Message-Id: X-Mailer: git-send-email 2.34.1 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_H2,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?1768199854329953782?= X-GMAIL-MSGID: =?utf-8?q?1768199854329953782?= If clk_get_rate() fails, the clk that has just been allocated needs to be freed. Fixes: 5f5a7a5578c5 ("serial: samsung: switch to clkdev based clock lookup") Signed-off-by: Christophe JAILLET Reviewed-by: Krzysztof Kozlowski Reviewed-by: Andi Shyti --- drivers/tty/serial/samsung_tty.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/tty/serial/samsung_tty.c b/drivers/tty/serial/samsung_tty.c index 2a7520ad3abd..dd751e7010e3 100644 --- a/drivers/tty/serial/samsung_tty.c +++ b/drivers/tty/serial/samsung_tty.c @@ -1459,8 +1459,10 @@ static unsigned int s3c24xx_serial_getclk(struct s3c24xx_uart_port *ourport, continue; rate = clk_get_rate(clk); - if (!rate) + if (!rate) { + clk_put(clk); continue; + } if (ourport->info->has_divslot) { unsigned long div = rate / req_baud; From patchwork Fri Jun 9 04:45:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe JAILLET X-Patchwork-Id: 105269 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp714039vqr; Thu, 8 Jun 2023 21:57:05 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6UpRr8XugtWZOhNDMX/5juPZ3hYUgGvpnUANuQ3f/q+l1BZuwq2CGwZVC4Z+19nBF+vLKo X-Received: by 2002:a05:6830:104d:b0:6b1:5fa8:77ee with SMTP id b13-20020a056830104d00b006b15fa877eemr479969otp.10.1686286625059; Thu, 08 Jun 2023 21:57:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686286625; cv=none; d=google.com; s=arc-20160816; b=zNX5OJXIrudQkQbqcI9E1ZLdqsYtg3x8fKeQzxwnxMjHwswho2m7/PvQaerwR66Z1d tv8dmmn2pjK2/jPiFwPn29SzXnI1O0I3eUyWjcbQvas6GrDF/iARFUxrsbK6SI37n0Yh NyMp3g2+23PaOTNTakrPJn4OQiFiK7ca94r5CCF1T9p0+pSZ8wt8mqyc4yPslJiwoI3g 52WY8jJ7J17rpkpqZFXwBM5yB55cJyn+ECb7Kz75n7mJ1Hvni46EQDVTuU7ZauQJNgu6 BToWFB11Ty9y9+j62AH/2K5bJ9lK3Rj/mwLA3BM5yZ73XTV38ac9rKt7N3nBBYybQnqm uX9g== 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=PEZXQDap3pTmCCLCcgCzrjYNlvmhAuSx1kWCIhd8mYU=; b=xcftvBJGg23sfRagOQ2Q+SwSNCsvRpz8/O4xk/VQC7rDFvnMOajUur9m9Ylgdi0ii4 jXqVnDWsp4t2LbpI8eS5b4wWJYmJTefUAd4aN78kQ01nQHsAVgmw19RcvbpZZN8v1sVy WDcdlXC/jIwNQWyQHkPu9hbIAQ5FZVqvOSlgd8Jj4b44VMrQ8BpT5p0Z6fzaN5HZ5WFl NtpdFqPYr/30GZcP5tUHhpoEzZtfraaZ/DlhiO7LKt0mfKwqJIBRFWzVegGHHua5O4+h N6U8hbZ290YqFm9LrOPFvqWNiUOFK+7iZTuSXM4RbyYJCYzCttzI6qK4iMYm5vTap/EN DLBQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@wanadoo.fr header.s=t20230301 header.b="MNXndMF/"; 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 z28-20020aa7959c000000b0066356d0888csi1810324pfj.113.2023.06.08.21.56.49; Thu, 08 Jun 2023 21:57:05 -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="MNXndMF/"; 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 S237142AbjFIEp6 (ORCPT + 99 others); Fri, 9 Jun 2023 00:45:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48734 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236735AbjFIEpy (ORCPT ); Fri, 9 Jun 2023 00:45:54 -0400 Received: from smtp.smtpout.orange.fr (smtp-19.smtpout.orange.fr [80.12.242.19]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D3CE630EC for ; Thu, 8 Jun 2023 21:45:53 -0700 (PDT) Received: from pop-os.home ([86.243.2.178]) by smtp.orange.fr with ESMTPA id 7U0KqPBjCDGHG7U0Wq4YHb; Fri, 09 Jun 2023 06:45:52 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=wanadoo.fr; s=t20230301; t=1686285952; bh=PEZXQDap3pTmCCLCcgCzrjYNlvmhAuSx1kWCIhd8mYU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=MNXndMF/jixUheplVtvmjAeKNdqfUNPyGiPl/BQL6RB8FmYTuDSD0XJmujKY+yCAI K8mm0h/Hajyw1zqBxN2m49rlL2K7GdkZHpirX8vjjktGce6QqrHJ2urq8Kbw1oFoI9 d2BG20yCDVqYhP+vEZa1utxMtwu9T7VINxnej2aA2xyqPiIjc0Df7W0qYLbgw211M0 6SmE2i5hucStjfdLlyJN2J+2o2udu9+UeBaAQOD3JcgLWLUWXt8cnfb29x4oS3XqIs cqUPy0HgV5AHSz+16w13cITmb50wgy8gu8KfTMBW3Reosssbtncwh9BThkQOggKGQi 38sMb7mq0Pp+w== X-ME-Helo: pop-os.home X-ME-Auth: Y2hyaXN0b3BoZS5qYWlsbGV0QHdhbmFkb28uZnI= X-ME-Date: Fri, 09 Jun 2023 06:45:52 +0200 X-ME-IP: 86.243.2.178 From: Christophe JAILLET To: Krzysztof Kozlowski , Alim Akhtar , Greg Kroah-Hartman , Jiri Slaby , Thomas Abraham , Kukjin Kim Cc: linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org, Christophe JAILLET , linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-serial@vger.kernel.org Subject: [PATCH 2/2] tty: serial: samsung_tty: Fix a memory leak in s3c24xx_serial_getclk() when iterating clk Date: Fri, 9 Jun 2023 06:45:39 +0200 Message-Id: <93bf8f574310256fcea50e5c5a62b5c37e20bb14.1686285892.git.christophe.jaillet@wanadoo.fr> 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_H2,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE 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?1768199683981639536?= X-GMAIL-MSGID: =?utf-8?q?1768199683981639536?= 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. Fixes: 5f5a7a5578c5 ("serial: samsung: switch to clkdev based clock lookup") Signed-off-by: Christophe JAILLET Reviewed-by: Krzysztof Kozlowski Reviewed-by: Andi Shyti --- This patch is speculative. Review with care. I think that some clk_put() are also missing somewhere else in the driver but won't be able to investigate further. --- 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 dd751e7010e3..c07877dd25fa 100644 --- a/drivers/tty/serial/samsung_tty.c +++ b/drivers/tty/serial/samsung_tty.c @@ -1488,10 +1488,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); } }