From patchwork Thu Mar 9 16:01:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Zimmermann X-Patchwork-Id: 66978 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp387805wrd; Thu, 9 Mar 2023 08:31:49 -0800 (PST) X-Google-Smtp-Source: AK7set/9y1AtfMNLRiOwCx4LaSLYkr9tWsWe5My2gIKJ4L5YfnSIyElYcCMnzjY2Cr96ANbuu+EJ X-Received: by 2002:a05:6e02:1447:b0:318:cda9:c60c with SMTP id p7-20020a056e02144700b00318cda9c60cmr17613628ilo.2.1678379509596; Thu, 09 Mar 2023 08:31:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678379509; cv=none; d=google.com; s=arc-20160816; b=dVIyfG6RKPMWvdJ1WWzZtk0bdHgkfLY0Vb9g5m4jSP8jEH7seuGrgpxiTD4gdoIqqw a5lVMcmSJxoBEVvkbEp7ZE7NVKPTrS9czLJvUvTIG1/OXfokWK9KAf06srzLiHxMIk6P CoyWksfk/xY+Fo15NVSqxp1NTpURpLuydOjKiFiuWgSDYJJlPDV6lIy92spBeynZDMln Inaz4fe0WB4TbIpV71FQGf5X0erEMPScwZFFpAo8j6xBiWeoqLThhJ3fNYG1CatnUxqB Ls5Ur7WftXp1fVNi1yRl2bIjr8R7WKCEqlDjr+ygoGMkjI09tQmKqj9vHuu9/376eG4D QBcA== 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=0OUYBLEIZcEGaUUIng7YnnYmnpc0Gk2LmDknjSg1lT8=; b=VUzHI3DmR/VVD0JxRAxeAOiC+gN9CRKjmY+QGPHDdx8wFQG4fx2uoxCC2Fn8a5QECP gHj1PfY+QCi2zdDq7KdykOgndIVWR/GQ2LyIMlokOzoxYFedn0dgIL3/GSv6u7S+4WtD JM6CW3QTqHK4t6GarxFCvaoGMBgrYSi4tS70plEgqYg73Ufk4s+dtDUXh14vrrKKyFgM lVjcxxm+U7Hi5Aa4ZY6aMQhjLl62W2km9lcxcSFSs/RL/WQYqLRvFybC5GviXWfq/kSP 4KsSYo1f4fe9t+T6xbN+JluVqsFpDhpHlFd8d9liXwF4HJzd0OEmc1bzCnSXli2/vpXw lOhg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=HHyh9U+3; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519 header.b=R8KA2keg; 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 j22-20020a02cc76000000b003c3efbcf077si18846406jaq.151.2023.03.09.08.31.34; Thu, 09 Mar 2023 08:31:49 -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=HHyh9U+3; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519 header.b=R8KA2keg; 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 S232324AbjCIQI2 (ORCPT + 99 others); Thu, 9 Mar 2023 11:08:28 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47500 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231708AbjCIQCb (ORCPT ); Thu, 9 Mar 2023 11:02:31 -0500 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 626B5F7EC6; Thu, 9 Mar 2023 08:02:30 -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 2389322160; Thu, 9 Mar 2023 16:02:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1678377749; 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=0OUYBLEIZcEGaUUIng7YnnYmnpc0Gk2LmDknjSg1lT8=; b=HHyh9U+3DSvAJPIq2fS/7MfoeTzd9ObdeJFQMqxok1yiU1rJWTiLvkXevHpyQbRRwFO96x 0NkhHnyZ+E5GlKDN6rl9vjIMXHGaW6suVHsS2OlvEnSS+b9KEh40L1smvlgHvzhYSQ/yD1 aOebOveTWnG6osC9mFLo5t2nNZ0/GFA= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1678377749; 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=0OUYBLEIZcEGaUUIng7YnnYmnpc0Gk2LmDknjSg1lT8=; b=R8KA2keggD95kmGethWRsJYpX9jmMj2Y1uKN3FdxDP9nIhNjdO2/O4nVZhvn1pRybcyAJj 3IHbjBH38DmiLYAA== 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 C14891391B; Thu, 9 Mar 2023 16:02:28 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id 6PhPLhQDCmQHbgAAMHmgww (envelope-from ); Thu, 09 Mar 2023 16:02:28 +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 061/101] fbdev/ps3fb: Duplicate video-mode option string Date: Thu, 9 Mar 2023 17:01:21 +0100 Message-Id: <20230309160201.5163-62-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?1759908472299710801?= X-GMAIL-MSGID: =?utf-8?q?1759908472299710801?= 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/ps3fb.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/video/fbdev/ps3fb.c b/drivers/video/fbdev/ps3fb.c index 2fe08b67eda7..d67ef2701b18 100644 --- a/drivers/video/fbdev/ps3fb.c +++ b/drivers/video/fbdev/ps3fb.c @@ -260,6 +260,7 @@ static const struct fb_videomode ps3fb_modedb[] = { static int ps3fb_mode; module_param(ps3fb_mode, int, 0); +static char *mode_option_buf; static char *mode_option; static int ps3fb_cmp_mode(const struct fb_videomode *vmode, @@ -1276,8 +1277,11 @@ static int __init ps3fb_setup(void) continue; if (!strncmp(this_opt, "mode:", 5)) ps3fb_mode = simple_strtoul(this_opt + 5, NULL, 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 0; } @@ -1294,6 +1298,7 @@ static void __exit ps3fb_exit(void) { pr_debug(" -> %s:%d\n", __func__, __LINE__); ps3_system_bus_driver_unregister(&ps3fb_driver); + kfree(mode_option_buf); pr_debug(" <- %s:%d\n", __func__, __LINE__); }