From patchwork Thu Mar 9 16:00:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Zimmermann X-Patchwork-Id: 66948 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp373197wrd; Thu, 9 Mar 2023 08:06:01 -0800 (PST) X-Google-Smtp-Source: AK7set/leLj3guOOaNbdVIQCubh21LalydIZ2oz64fi2KDjRiHrcb8truntN2/2UjaI/p43yvX4n X-Received: by 2002:a17:90a:34c:b0:23a:baf:ffec with SMTP id 12-20020a17090a034c00b0023a0bafffecmr22869690pjf.22.1678377961280; Thu, 09 Mar 2023 08:06:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678377961; cv=none; d=google.com; s=arc-20160816; b=Psx59UbsCPpvRafJf9dBUOce5uwTI2MFXzhJ0IjgHKLoBLNDTSHDzyoR3JpaagDoe9 jHKnXrHIA3w47r6PYRaspSu1Ileyykczyr3d0JEk589Y/1wQZmzoIhHRCXizQdMp/naS FR1Su6nvv1kb827995Oq7ZLO+8hppSXyjS+Eo+3W0Du/zNnm0H2rlwtkftM1LfrqQPiB KYrNsR+N0KpsewLR/NXadWwEqoy2E3qSAhlvdKWxN4H0WDRJnNtOvE1O7BCgLyo8tOzD ev/V6xdjeD439fnxHsY8BeXSWjSGkpuuJ4oZUH0MHMZHYVF3tiTiiozzX5xBc2T4eNwp YHSQ== 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=EaSo/FjIqDYQ8wz/hJX7q8fOkI//7V7PpDYHGeI1dog=; b=mXsebbyc3AecmfO3X47RRk5wmmY1zXljPWLgLJTkicrxJxDYsFDd9g+wSOFq9cH3IR VpniezL0JkqPn4VvKj5DcBSviwZvLX6t30xfC+3DNomrYlqdTKzLLrNcoQf/TFbkL1st 1n3cwpFza15OaV2aiGt/snoQtdxWMY7z0rrnow7pIOZD+6vqA/5CgUzJEKQbHAoXQK0u xP+k0/gc7PsU2LNBdPICP4XRXyFtXGgzJ/MeTmcsiCafezllCdgDX6EZ8Yj9yJpi2/uo UrfsYTBZOnxzmWy8bkxWVw3pFQ3pZiIoSTThYcl5rjg4yWGU0kojXBx86ps3ucre74qb SoiA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=Zl37TQUB; 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 o3-20020a17090aac0300b0023412ab58edsi159837pjq.90.2023.03.09.08.05.45; Thu, 09 Mar 2023 08:06:01 -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=Zl37TQUB; 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 S232101AbjCIQEo (ORCPT + 99 others); Thu, 9 Mar 2023 11:04:44 -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 S231516AbjCIQCT (ORCPT ); Thu, 9 Mar 2023 11:02:19 -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 EAEAEF7ECA; Thu, 9 Mar 2023 08:02:14 -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 A35C620184; Thu, 9 Mar 2023 16:02:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1678377733; 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=EaSo/FjIqDYQ8wz/hJX7q8fOkI//7V7PpDYHGeI1dog=; b=Zl37TQUBIFv35lY19n3nS3tLa2FFsxJiXyKu0ntn9OitQvN9qV64et55L5ncF8OcVjf1WG +XhohQK5UXH052azkgnzyxd2nz1Qkd2OpTkdSpPgCbdwQm66W2+1CxhiLiFNZG+6j0kYbB FCaopvk9eAADime7c/aNy05Dz1WxNs8= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1678377733; 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=EaSo/FjIqDYQ8wz/hJX7q8fOkI//7V7PpDYHGeI1dog=; b=5Z9bcjxfst7+0FQNfLF+GH7Fj0qv2kRw4n2NnnA6eoV1qR3tPb9t9COkW0Qxg//N/8Sp1y VxZyjZLTaEHrOGCw== 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 3D4AF1391B; Thu, 9 Mar 2023 16:02:13 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id sJ7uDQUDCmQHbgAAMHmgww (envelope-from ); Thu, 09 Mar 2023 16:02:13 +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 022/101] fbdev/fsl-diu-fb: Duplicate video-mode option string Date: Thu, 9 Mar 2023 17:00:42 +0100 Message-Id: <20230309160201.5163-23-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?1759906849162003501?= X-GMAIL-MSGID: =?utf-8?q?1759906849162003501?= 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, Timur) Signed-off-by: Thomas Zimmermann --- drivers/video/fbdev/fsl-diu-fb.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/video/fbdev/fsl-diu-fb.c b/drivers/video/fbdev/fsl-diu-fb.c index e332017c6af6..033bbf0c40b7 100644 --- a/drivers/video/fbdev/fsl-diu-fb.c +++ b/drivers/video/fbdev/fsl-diu-fb.c @@ -307,6 +307,7 @@ static struct fb_videomode fsl_diu_mode_db[] = { }, }; +static char *fb_mode_buf; static char *fb_mode; static unsigned long default_bpp = 32; static enum fsl_diu_monitor_port monitor_port; @@ -1858,8 +1859,11 @@ static int __init fsl_diu_setup(char *options) } else if (!strncmp(opt, "bpp=", 4)) { if (!kstrtoul(opt + 4, 10, &val)) default_bpp = val; - } else - fb_mode = opt; + } else { + kfree(fb_mode_buf); + fb_mode_buf = kstrdup(opt, GFP_KERNEL); // ignore errors + fb_mode = fb_mode_buf; + } } return 0; @@ -1978,6 +1982,7 @@ static void __exit fsl_diu_exit(void) #if defined(CONFIG_NOT_COHERENT_CACHE) vfree(coherence_data); #endif + kfree(fb_mode_buf); } module_init(fsl_diu_init);