From patchwork Mon Mar 6 16:00:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Zimmermann X-Patchwork-Id: 64930 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1942370wrd; Mon, 6 Mar 2023 08:37:55 -0800 (PST) X-Google-Smtp-Source: AK7set9EWkR6Su0oixfnt4Ljh+gtXYTGIR4b1tDd8JCoPWROJqHm6CarJfm8fkmUlaIuiN504ZG2 X-Received: by 2002:a17:902:d544:b0:19d:387:6602 with SMTP id z4-20020a170902d54400b0019d03876602mr12010981plf.58.1678120674928; Mon, 06 Mar 2023 08:37:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678120674; cv=none; d=google.com; s=arc-20160816; b=y+4NZatkuhuRTkGAdjSXMKX2lCbI33ogPN8iT+/8VQ5t9MtzkrlWzEbWDze+hBfzWa iQF7r+5rFyL8xEj1ioAE2709F3zF1YXtIMyzEhd5oyOeegV6fQ+bvdRzeNbfsm4ZzQhz LQiAfVVfYZPPUGAjxNzVfkCDmYaOU0R2enW0e4GO7g4NVe0yagdU8HN0J0oLhc5Akov/ FxsDkaCOCmapOshk+vk0HQJjcgPrbEvk30utC7YMyUlH9AetYGuSvcU9MPr+tlENyf5f SSHzTG50Ji19m1cQxl7oLOTSeCFcjKIDJmu+83nD8AERnjRcgGNQdDmfqByUS+OiGYaz rwqw== 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=ycoi4td43MhalPP9ez+KkigUFBrWFEhU6qfgrbIMAG0=; b=OAVZ8C5fxLMe8DLKfsqYKOT87mf+oDyclo45VJUxEV2djtiFstAhCDnMbhw+Eaehpu pClm6Hq7Dwu0M3FZqVwayYqaWnGt8st99p+OsL6uWf2sO3AF7nfXF6dnSrX0h0sMbxjH HgTFwDaMlkMURV0WcK898YgkguFlv+IwiLQyTEK4ilwa23/WwCMO93wchUiLrzLLRlQG TFL/giA3r/mqSaxX7Ms9KfJzm+Ffx1LY0mdy4rXLG5V/nPeE31TjvB0qEYsJDKl4U7Oc CfiYihodhtOSN7vWK/+QoPW/H+d/XxOMOkVhDttnjmg9NxZ0iyFibr5P368hyUODCdGN VPYA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=mTVFrA71; 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 u9-20020a170902e5c900b0019aa9c82c71si10589701plf.263.2023.03.06.08.37.42; Mon, 06 Mar 2023 08:37:54 -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=mTVFrA71; 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 S231642AbjCFQGq (ORCPT + 99 others); Mon, 6 Mar 2023 11:06:46 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42472 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231533AbjCFQBK (ORCPT ); Mon, 6 Mar 2023 11:01:10 -0500 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5F7722FCEF; Mon, 6 Mar 2023 08:01:02 -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 EAD252245C; Mon, 6 Mar 2023 16:01:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1678118460; 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=ycoi4td43MhalPP9ez+KkigUFBrWFEhU6qfgrbIMAG0=; b=mTVFrA71Y/lKqIayleCJsy7TiNv3hllchoXLngFUEk8al+vQdE7pKPjgELc5k7neotZaiR DEHJ4F5nXnql0FFRwGz6s2FtzOrb78g3feEGDhaY/vHxE6HZ9rgj6zFdemib0AvFWGebBM DSG79E0tIJ9OL14LtyE/18jRZIrCn+M= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1678118460; 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=ycoi4td43MhalPP9ez+KkigUFBrWFEhU6qfgrbIMAG0=; b=WqtHLrbbrM54fNxv9XHbii5NOEwV8YHpN5nWAUxfOXnJ95zppxmIVqShefTwT2NxRXy0UF tIkszX43AseTZ6CA== 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 9067D13A6A; Mon, 6 Mar 2023 16:01:00 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id OPpkIjwOBmQ/PwAAMHmgww (envelope-from ); Mon, 06 Mar 2023 16:01:00 +0000 From: Thomas Zimmermann To: deller@gmx.de, paulus@samba.org, benh@kernel.crashing.org, linux@armlinux.org.uk, pjones@redhat.com, timur@kernel.org, adaplas@gmail.com, s.hauer@pengutronix.de, shawnguo@kernel.org, mbroemme@libmpq.org, thomas@winischhofer.net, James.Bottomley@HansenPartnership.com, spock@gentoo.org, sudipm.mukherjee@gmail.com, teddy.wang@siliconmotion.com, geert+renesas@glider.be, corbet@lwn.net Cc: linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Thomas Zimmermann Subject: [PATCH 94/99] fbdev/vfb: Duplicate video-mode option string Date: Mon, 6 Mar 2023 17:00:11 +0100 Message-Id: <20230306160016.4459-95-tzimmermann@suse.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230306160016.4459-1-tzimmermann@suse.de> References: <20230306160016.4459-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?1759637064859543828?= X-GMAIL-MSGID: =?utf-8?q?1759637064859543828?= Assume that the driver does not own the option string or its substrings and hence duplicate the option string for the video mode. The driver only parses the option string once as part of module initialization, so use a static buffer to store the duplicated mode option. Linux automatically frees the memory upon releasing the module. Done in preparation of switching the driver to struct option_iter and constifying the option string. Signed-off-by: Thomas Zimmermann --- drivers/video/fbdev/vfb.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/drivers/video/fbdev/vfb.c b/drivers/video/fbdev/vfb.c index 680c88267ef4..15a6a0896ab5 100644 --- a/drivers/video/fbdev/vfb.c +++ b/drivers/video/fbdev/vfb.c @@ -412,8 +412,17 @@ 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 { + static char mode_option_buf[256]; + int ret; + + ret = snprintf(mode_option_buf, sizeof(mode_option_buf), "%s", this_opt); + if (WARN(ret < 0, "vfb: ignoring invalid option, ret=%d\n", ret)) + continue; + if (WARN(ret >= sizeof(mode_option_buf), "vfb: option too long\n")) + continue; + mode_option = mode_option_buf; + } } return 1; }