From patchwork Thu Mar 9 16:01:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Zimmermann X-Patchwork-Id: 66969 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp386493wrd; Thu, 9 Mar 2023 08:29:31 -0800 (PST) X-Google-Smtp-Source: AK7set/GtvWHb7lIieb80JNUWOvK+7COwKcsUQBoCO5hft7TwjnVDLqD4Abpd+fKniHKx0sbg8Se X-Received: by 2002:a17:903:1c1:b0:19e:6700:174 with SMTP id e1-20020a17090301c100b0019e67000174mr27554156plh.25.1678379371554; Thu, 09 Mar 2023 08:29:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678379371; cv=none; d=google.com; s=arc-20160816; b=rHD3RQp1T+4dR2fbQSbrFHp8xJvHl8JSuH3ZVmweJ9H2poS4OWfLP0G+D1xIl3BLXL bz008cr02pCrXmfwDSg6VxN9MsfAtStTVcLrgSyXgzJxjtg4aJvw9t1uy7p8/ybdWkb5 bCoBCBiZQ4vNSsHFDjXjKvigrWWPJIn5NVqNmMcIWF1FyxCRUlIeipil6kruIkHYCfYk /HVGFIif2dSjZswncclunMCX+Bxw1cSn8UD7UoJAkkqFRaIGPvt6VZO9n4tzGbky8UP/ 8I16vgqE6w1zv1033yQssWnn3SfTW8W8EFZYQqVKYyxvs59yCvGfKfDNY7JRqTRAqQUZ QRxw== 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=JrTWZ35A8KxaVoBf2I0MCmqaACOIQrBJsCXoiqqjOIA=; b=hz3MA+DfHFnnwDlZu5Gwycnrc8H+vFc7PBGwMk94K/AepAMq+BzJC28ZJ0FMBSJoWY fWuwg0CuzCYhUzDZaSUAdqFf9E6emQL5TX8dXQxC0bUMDrmKELSQNIZuLNcGgISyK1WY 1TTu0wmpGXjDSM/AtlNlrMA/cvltwZE5uyWeyDWsXqSZZh/OptYX5dCK9aU45wXd4jou r/XDT82FDMsaH8Mqnrqs0yyqa20yEhK84D1zAssh6O/4J02uXSxIlD361XmGdhpAEb+I 7hBtTbtz2Gk59J2+r/3yhK8ae5ctY4XStQIkrx07XhGsao1PbARMWrnt0S65ys6bXKFL uWSQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=jS0ssRuC; dkim=neutral (no key) header.i=@suse.de header.b=2edF2x5b; 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 ji20-20020a170903325400b0019e6e61c3dfsi17144116plb.315.2023.03.09.08.29.18; Thu, 09 Mar 2023 08:29: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=jS0ssRuC; dkim=neutral (no key) header.i=@suse.de header.b=2edF2x5b; 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 S232196AbjCIQHF (ORCPT + 99 others); Thu, 9 Mar 2023 11:07:05 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47430 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231696AbjCIQC3 (ORCPT ); Thu, 9 Mar 2023 11:02:29 -0500 Received: from smtp-out1.suse.de (smtp-out1.suse.de [IPv6:2001:67c:2178:6::1c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E944FF4B7A; Thu, 9 Mar 2023 08:02:28 -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 A20712215D; Thu, 9 Mar 2023 16:02:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1678377747; 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=JrTWZ35A8KxaVoBf2I0MCmqaACOIQrBJsCXoiqqjOIA=; b=jS0ssRuCETelh7ixW7TzhRrWWiUInqyfgqWQeYCgO9RNtbERztNuozpHaAMoWgl8npDobz 5y5FeFw9/wSwZBbVV8ga82Whtu9q0orO7y60gRBTE9sm+paDV0gGPqtbWrY2kVMv6MelVo nXhYZ9q5UPoc5R3G9HKCVBIFofxskvU= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1678377747; 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=JrTWZ35A8KxaVoBf2I0MCmqaACOIQrBJsCXoiqqjOIA=; b=2edF2x5brkFqa+DmyZWXVmjoNOy+6kv0RKfqRxrbUk+Za1jSvWMtiQ81zvUCgCGJhblwix XzdXKe0+xVf67bDg== 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 4386B1391B; Thu, 9 Mar 2023 16:02:27 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id SIOdDxMDCmQHbgAAMHmgww (envelope-from ); Thu, 09 Mar 2023 16:02:27 +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 057/101] fbdev/pm2fb: Duplicate video-mode option string Date: Thu, 9 Mar 2023 17:01:17 +0100 Message-Id: <20230309160201.5163-58-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?1759908327940008560?= X-GMAIL-MSGID: =?utf-8?q?1759908327940008560?= 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/pm2fb.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/video/fbdev/pm2fb.c b/drivers/video/fbdev/pm2fb.c index 47d212944f30..69a0b2216a86 100644 --- a/drivers/video/fbdev/pm2fb.c +++ b/drivers/video/fbdev/pm2fb.c @@ -64,6 +64,7 @@ * Driver data */ static int hwcursor = 1; +static char *mode_option_buf; static char *mode_option; /* @@ -1792,8 +1793,11 @@ static int __init pm2fb_setup(char *options) nomtrr = 1; else if (!strncmp(this_opt, "noaccel", 7)) noaccel = 1; - else - mode_option = this_opt; + else { + kfree(mode_option_buf); + mode_option_buf = kstrdup(this_opt, GFP_KERNEL); // ignore errors + mode_option = mode_option_buf; + } } return 0; } @@ -1828,6 +1832,7 @@ module_init(pm2fb_init); static void __exit pm2fb_exit(void) { pci_unregister_driver(&pm2fb_driver); + kfree(mode_option_buf); } #endif