From patchwork Thu Mar 9 16:01:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Zimmermann X-Patchwork-Id: 67036 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp390435wrd; Thu, 9 Mar 2023 08:36:52 -0800 (PST) X-Google-Smtp-Source: AK7set+3ryNr01urL0DowuWrH4adeB+dkD6BDm5Ta2ZrnTZWCnNkUEHEFiUD42NBYz2wH8uG0EAB X-Received: by 2002:a17:90b:3b90:b0:233:ebd4:301c with SMTP id pc16-20020a17090b3b9000b00233ebd4301cmr1534339pjb.1.1678379812607; Thu, 09 Mar 2023 08:36:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678379812; cv=none; d=google.com; s=arc-20160816; b=rvhF/kPnMJAjs6MSAK/k/kUDaubWpJBphPzJvOt7LnbC6VbvfU8b8AejNNrbGy5yUa npKR3oxTTMxHO8SyJsuiQHNJp72pX7rvB0G9QSNCYXgePbif/IbtLuDp+Q0OXFAUxeY5 uqkzofrxGGZ3CwhW/grGALg1bCezBshHGrSi+Wl3lKPEZUBcNy6sKDbrWhHk6Jwa14DQ kSi7I7dQHF58tRVdRR6W5kXj3u3Dhrk1DCzc+GzrILxHun8btN7cmSpwF/0NHpI11MWY fxwsvmMNbHUgZM1qMtebGugyq5EpHtqyPb1iGP9PkORO/lXRBzO7YUyf/v6hupGBf+pC caJQ== 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=KeY2ExOwmSx8zLHCGIHXA1tubiVzXH1BzWog2OAH98g=; b=ZyyB6y/RROYz9mzBEJLLRRVtYGVGIKmIX5UIyuIUHFce6YQOgtM8c3NaZC3asmRuK1 hyfrBoEgjAtUfVVHC3thjW0dZl2EQcQ84tl+LowGlk1bJlb2JBDLFu4g1/MuVor5w3fV iYh5/4sWWKBejTi4rulISviRv8iVrSZRk97jO9q7fqOgjd12PtF2cZV3yfC8BBjnoOu2 QOVLmnmXkBbmd4w7NVtnLvF6me6BWICB2i2k5MQTZcSTl15LB5ObcgzvEJY63umq3pap tzSZ00pjEGPEAojorRCUUljz+VwTkXIpU56YomeVm3+qdYLGb3FqgpJw7g+E2INTCQ2Y +s+Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=LZFm7R8O; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519; 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 m3-20020a632603000000b00502f0ccbcc0si1687346pgm.233.2023.03.09.08.36.37; Thu, 09 Mar 2023 08:36:52 -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=LZFm7R8O; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519; 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 S232640AbjCIQKm (ORCPT + 99 others); Thu, 9 Mar 2023 11:10:42 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48248 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231594AbjCIQCp (ORCPT ); Thu, 9 Mar 2023 11:02:45 -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 0194DF4B7A; Thu, 9 Mar 2023 08:02:44 -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 A5E3C2018E; Thu, 9 Mar 2023 16:02:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1678377762; 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=KeY2ExOwmSx8zLHCGIHXA1tubiVzXH1BzWog2OAH98g=; b=LZFm7R8Of8rUK0MPl8Rv51d9MNca4y4qBiUfwCYMAjb8Ez2GFtPGCqBZOI9FyEB1sWV60f 50vBojV0zeTvTjBJcFnwIW0RX2mB44FAJqfg4RWIWVz5sxsOaX+JZP6Wqy69YJasouluLv jPbSywMOwccCbHhprxaXHud+yKVuxlU= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1678377762; 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=KeY2ExOwmSx8zLHCGIHXA1tubiVzXH1BzWog2OAH98g=; b=LwuaA/5VcZNBiLfHYsJBO6Ju3pNq48IVDuopszjyOASThdVEfJypODY6G6ri3qHb31UWkD yWwOSR1FhQJDVFDA== 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 495E013A73; Thu, 9 Mar 2023 16:02:42 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id +AAeESIDCmQHbgAAMHmgww (envelope-from ); Thu, 09 Mar 2023 16:02:42 +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 094/101] fbdev/vfb: Duplicate video-mode option string Date: Thu, 9 Mar 2023 17:01:54 +0100 Message-Id: <20230309160201.5163-95-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?1759908790545115816?= X-GMAIL-MSGID: =?utf-8?q?1759908790545115816?= 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/vfb.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/video/fbdev/vfb.c b/drivers/video/fbdev/vfb.c index 680c88267ef4..de27fe84d820 100644 --- a/drivers/video/fbdev/vfb.c +++ b/drivers/video/fbdev/vfb.c @@ -37,6 +37,7 @@ static u_long videomemorysize = VIDEOMEMSIZE; module_param(videomemorysize, ulong, 0); MODULE_PARM_DESC(videomemorysize, "RAM available to frame buffer (in bytes)"); +static char *mode_option_buf; static char *mode_option = NULL; module_param(mode_option, charp, 0); MODULE_PARM_DESC(mode_option, "Preferred video mode (e.g. 640x480-8@60)"); @@ -412,8 +413,11 @@ static int __init vfb_setup(char *options) /* Test disable for backwards compatibility */ if (!strcmp(this_opt, "disable")) vfb_enable = 0; - 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 1; } @@ -543,6 +547,7 @@ static void __exit vfb_exit(void) { platform_device_unregister(vfb_device); platform_driver_unregister(&vfb_driver); + kfree(mode_option_buf); } module_exit(vfb_exit);