From patchwork Thu Mar 9 16:01:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Zimmermann X-Patchwork-Id: 66971 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp386971wrd; Thu, 9 Mar 2023 08:30:31 -0800 (PST) X-Google-Smtp-Source: AK7set9f1gc8Za3YlVSiwQNxqD1W2fy4LQSZQsv5S5aNMw/Mvv3YU9D7zNzFLTOp2TRdeMCb3ZBe X-Received: by 2002:a17:903:11c9:b0:19e:cfbf:dcbb with SMTP id q9-20020a17090311c900b0019ecfbfdcbbmr13080918plh.66.1678379431286; Thu, 09 Mar 2023 08:30:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678379431; cv=none; d=google.com; s=arc-20160816; b=MygXDRnEzsSPm9VrxfkX6DzRYZ8zpYxk4Oi+mXYzFn/ysKFjxIDI2nynzMQZZVoChe ph7TmIxrbGhVxtuD7Jpvi63keXT38YqnGgDW1RVH5axdKTn/2hXMJFXXAin42Ztpqn9O Ni0Bk0sp4Q0GBhAh7U99EVzTbGxAF9edWrRDHRzx86Y57TaF2albL3e7QXB5I1xtiphg uk9h0EOMcTyCVgVFyfAUT28gww9f9L9Sx+tdTRxSBQTo7gR/T4gHqS+YXSmBux+fWaUj dgXF0A4EkgfajgNvnqLlw+103mQ8ZcTc4B9v3+vSK47w034AfzQodSsvwMO+I+XXSFXs 1h1w== 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=2NH6+VMOHM5Bo+HTdsXwHkuMcnMRmvfOynxZTybH+bo=; b=y12l7yrZ4T4pM8TLf2IIt2LkRmInWt8fWtRO/k527C05TNOhikDHNSME4d9hfL06VH GtnQN5n79CvgHuLFOz9GSpgwAo8SAgiiFcchHMYMbkd/q+qRUEemFd00kPduGzdduipK 4nVOeMvw2KyYkMdZO0vCxPEOi7q7eHEluC+za0342qG4eHwc8q+ogomVOmZAc8qtxytN tjM7B916PRmukWfFrrdZMs+YUIwaPZajx6/uWt8+IpIjK5rAMWos2+kO9vz75yVOfX0g IUGDR5T6TmP57p8TsenLgf9nC+Qng1T9q/HMILrN6BnAz5oue+APbWYgaBhgc5UvCf0u J4cw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=go1Eo7rs; dkim=neutral (no key) header.i=@suse.de header.b=E2S+X322; 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 kh6-20020a170903064600b0019e29ce6975si16607001plb.202.2023.03.09.08.30.18; Thu, 09 Mar 2023 08:30:31 -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=go1Eo7rs; dkim=neutral (no key) header.i=@suse.de header.b=E2S+X322; 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 S231708AbjCIQIf (ORCPT + 99 others); Thu, 9 Mar 2023 11:08:35 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47714 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231730AbjCIQCe (ORCPT ); Thu, 9 Mar 2023 11:02:34 -0500 Received: from smtp-out2.suse.de (smtp-out2.suse.de [IPv6:2001:67c:2178:6::1d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 77733F7EDF; 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-out2.suse.de (Postfix) with ESMTPS id C832E20194; Thu, 9 Mar 2023 16:02:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1678377751; 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=2NH6+VMOHM5Bo+HTdsXwHkuMcnMRmvfOynxZTybH+bo=; b=go1Eo7rsPRB5BTU6t1uZeaY1P9a+UShfP9tySZW6muM3zfoSxWuJ0JgsuNBQ23dT9Avu82 vMyTTtUhQoqe513nmX0H/WS6nKOdeXIx4OFmD+UGQZXCL1l+oY4OiLIrWOtouY02A85513 GEPk0Gg699Q4RykUQPURPtRxv2Nhs38= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1678377751; 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=2NH6+VMOHM5Bo+HTdsXwHkuMcnMRmvfOynxZTybH+bo=; b=E2S+X322wx/wHA2eX9UG4JiDR8pRg9/T2WXFXdRMBwmB1EvU4abjgoqd+RB6MO/AftXP+T XJzzO7fUrj/3LeCA== 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 6EE4A13A73; Thu, 9 Mar 2023 16:02:31 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id iNk9GhcDCmQHbgAAMHmgww (envelope-from ); Thu, 09 Mar 2023 16:02:31 +0000 From: Thomas Zimmermann 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 Subject: [PATCH v2 068/101] fbdev/s3fb: Duplicate video-mode option string Date: Thu, 9 Mar 2023 17:01:28 +0100 Message-Id: <20230309160201.5163-69-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 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: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759908390669205672?= X-GMAIL-MSGID: =?utf-8?q?1759908390669205672?= 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 --- drivers/video/fbdev/s3fb.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/video/fbdev/s3fb.c b/drivers/video/fbdev/s3fb.c index 7d257489edcc..6bcedcde8aad 100644 --- a/drivers/video/fbdev/s3fb.c +++ b/drivers/video/fbdev/s3fb.c @@ -150,6 +150,7 @@ static const struct svga_timing_regs s3_timing_regs = { /* Module parameters */ +static char *mode_option_buf; static char *mode_option; static int mtrr = 1; static int fasttext = 1; @@ -1535,8 +1536,11 @@ static int __init s3fb_setup(char *options) mtrr = simple_strtoul(opt + 5, NULL, 0); else if (!strncmp(opt, "fasttext:", 9)) fasttext = simple_strtoul(opt + 9, NULL, 0); - else - mode_option = opt; + else { + kfree(mode_option_buf); + mode_option_buf = kstrdup(opt, GFP_KERNEL); // ignore errors + mode_option = mode_option_buf; + } } return 0; @@ -1549,6 +1553,7 @@ static void __exit s3fb_cleanup(void) { pr_debug("s3fb: cleaning up\n"); pci_unregister_driver(&s3fb_pci_driver); + kfree(mode_option_buf); } /* Driver Initialisation */