Message ID | 20230309160201.5163-71-tzimmermann@suse.de |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp388122wrd; Thu, 9 Mar 2023 08:32:24 -0800 (PST) X-Google-Smtp-Source: AK7set/jrmI33hP0Zoaexa2Lz/H47tSmimR98AWjTjyScMEcY28N0ck4pn7jQ7rvAKO77h7U6XJx X-Received: by 2002:a62:7983:0:b0:5a8:c90d:ab17 with SMTP id u125-20020a627983000000b005a8c90dab17mr20387940pfc.15.1678379544004; Thu, 09 Mar 2023 08:32:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678379543; cv=none; d=google.com; s=arc-20160816; b=xKMpe9ZRyVSxGuIgQXJXLOjDz2KlDeXWydOYJcn3jX4f+IASJdW/GNCPJ+u1qOIbx1 aYM7mfoL5Rdp7gjB/bumSoi1kxIWclZ6/+K8p5nMvJENFPTcWesRxAgCjngIdt3sN09/ TLNwLjSq8z+iveBkvcItNUmAHcY7yqISGmG/QRJfsu3HUU0rtXrpqAQbkDaGG5fJtOlW SpQ9rLQ0QHgeM4q28vGRp8JFW9w6nqR+m4qKtes+zlBsa5jTVRrIrdCzOyROt1WGdmK+ /Qn9f+RHWg+RYUzxNzxEsVI9JQtzbzCjTocXuLJzeMDnCD11hmhWZVw+gXzY2jZetvMI ok/w== 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:dkim-signature; bh=yPzn7zXM7yj42koki0aANjXUDhnwLRtgpbH+HR/F9bc=; b=qgejCFg/jQQD+HlQNrpfbCczf1vzd5kGFcgpm/YBRH9Kv5QDZF0BlhdcMpm99CnBZ9 1f3zO+rVesVTU++1+GJmWNljuqJGKiAb3NeEEIIo11dfCPll229U4deqIPFjI4TiH6Rr kO6loql7twgenZOSCWDEcZV5JIFKX4Jm0qRoQC7E9XaMDfoUVrPYYtmsQsLW8s/98eTY eB6oaDk7Ia7VUf2tcgsPlRDtjwupXRsR6ywn82AI1LmRgRrSrtDMmIelSj2Aow6fWX5N Jone9KOi05TmQ2h0LgLNTPf8HzHnLSnTtmJ5bRiuoHHbpC36WF+vmkLgguBfO+dTcwwk +vFQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=hVbhDNWR; dkim=neutral (no key) header.i=@suse.de; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id b2-20020aa78ec2000000b005a919052520si6113146pfr.317.2023.03.09.08.32.09; Thu, 09 Mar 2023 08:32:23 -0800 (PST) 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=@suse.de header.s=susede2_rsa header.b=hVbhDNWR; dkim=neutral (no key) header.i=@suse.de; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231563AbjCIQJB (ORCPT <rfc822;carlos.wei.hk@gmail.com> + 99 others); Thu, 9 Mar 2023 11:09:01 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47512 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230288AbjCIQCe (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Thu, 9 Mar 2023 11:02:34 -0500 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D86C1F7EE0; Thu, 9 Mar 2023 08:02:33 -0800 (PST) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 931CF22161; Thu, 9 Mar 2023 16:02:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1678377752; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=yPzn7zXM7yj42koki0aANjXUDhnwLRtgpbH+HR/F9bc=; b=hVbhDNWRVOwus2xxkHmc/4gF3MymqYwK8KfEjd7hiO/1foTLysxr6pY3x9QTB21pfXhCrZ rL79SiO9dVnHM1kCiAn7XxEcVb1yf4DBn6GHi77/m1k8mX/Gi77Ylfz5i6VIQCBQY00Pqb pSeFzeEkGp/5b11SM/UeJiRKLMJ9U5s= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1678377752; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=yPzn7zXM7yj42koki0aANjXUDhnwLRtgpbH+HR/F9bc=; b=lW6WAUz/SE0GTx65vIG2i/+fVrq2paAzGgiR4MR+B7LSQ8dSaU/fC3ywfoNIo0UDbYm1fX yvVg50kSj3KjGCCQ== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 33C1213A73; Thu, 9 Mar 2023 16:02:32 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id EH/TCxgDCmQHbgAAMHmgww (envelope-from <tzimmermann@suse.de>); Thu, 09 Mar 2023 16:02:32 +0000 From: Thomas Zimmermann <tzimmermann@suse.de> To: deller@gmx.de, geert+renesas@glider.be, timur@kernel.org, rdunlap@infradead.org, paulus@samba.org, benh@kernel.crashing.org, linux@armlinux.org.uk, pjones@redhat.com, adaplas@gmail.com, s.hauer@pengutronix.de, shawnguo@kernel.org, mbroemme@libmpq.org, thomas@winischhofer.net, James.Bottomley@HansenPartnership.com, sudipm.mukherjee@gmail.com, teddy.wang@siliconmotion.com, corbet@lwn.net Cc: linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Thomas Zimmermann <tzimmermann@suse.de> Subject: [PATCH v2 070/101] fbdev/savagefb: Duplicate video-mode option string Date: Thu, 9 Mar 2023 17:01:30 +0100 Message-Id: <20230309160201.5163-71-tzimmermann@suse.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230309160201.5163-1-tzimmermann@suse.de> References: <20230309160201.5163-1-tzimmermann@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS 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: <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?1759908508632512941?= X-GMAIL-MSGID: =?utf-8?q?1759908508632512941?= |
Series |
fbdev: Fix memory leak in option parsing
|
|
Commit Message
Thomas Zimmermann
March 9, 2023, 4:01 p.m. UTC
Assume that the driver does not own the option string or its substrings
and hence duplicate the option string for the video mode. Allocate the
copy's memory with kstrdup() and free it in the module's exit function.
Done in preparation of switching the driver to struct option_iter and
constifying the option string.
v2:
* replace static memory with kstrdup()/kfree() (Geert)
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
---
drivers/video/fbdev/savage/savagefb_driver.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/video/fbdev/savage/savagefb_driver.c b/drivers/video/fbdev/savage/savagefb_driver.c index 4a27b68798bf..0ca5894114c9 100644 --- a/drivers/video/fbdev/savage/savagefb_driver.c +++ b/drivers/video/fbdev/savage/savagefb_driver.c @@ -65,6 +65,7 @@ /* --------------------------------------------------------------------- */ +static char *mode_option_buf; static char *mode_option = NULL; #ifdef MODULE @@ -2530,6 +2531,7 @@ static void __exit savage_done(void) { DBG("savage_done"); pci_unregister_driver(&savagefb_driver); + kfree(mode_option_buf); } @@ -2544,7 +2546,9 @@ static int __init savagefb_setup(char *options) return 0; while ((this_opt = strsep(&options, ",")) != NULL) { - mode_option = this_opt; + kfree(mode_option_buf); + mode_option_buf = kstrdup(this_opt, GFP_KERNEL); // ignore errors + mode_option = mode_option_buf; } #endif /* !MODULE */ return 0;