From patchwork Mon Mar 6 15:58:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Zimmermann X-Patchwork-Id: 64820 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1922613wrd; Mon, 6 Mar 2023 08:03:23 -0800 (PST) X-Google-Smtp-Source: AK7set8EEpthOtmR/e4dA4SKCf04sJPmRlfclMegKzavIL50G5jjpQF5d2HQp7Xl4V6MViDOaRsM X-Received: by 2002:a62:38c3:0:b0:5a9:b7e3:2ed1 with SMTP id f186-20020a6238c3000000b005a9b7e32ed1mr9533642pfa.18.1678118603045; Mon, 06 Mar 2023 08:03:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678118603; cv=none; d=google.com; s=arc-20160816; b=NR2qeZzoG/qJIvcGiH9QK9Y0ovd/EVYXogxti6ymVg2AYoCWOoDPdJVSQkRIZSr3Sp xNlrSaIU9C9kC0Q+s04f8NC1TaxhF6q+AdPNEPJqJb121/qBOlRFUlz8dBcfpg+GugfH yeRqE4n8G2PRcNjixXFn90yqXX5OPS+mtOrTypp5wn4N1wW1DLRvAPfLTAN/lJI7JLkS 1I5o9ayv7cX8+yW10jqM73SLEkicGmeocWiaO3zuH7r4NW5xTmkkA8zBJ6V7DV5NmpVC CpZurJzl3Kw2hixVfY+G9yjmIkfGyFVMAs0kYGV/rk/hMjw8xu/bj1FSJnZjQSocl2lb tnAg== 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=7NWpiNTTADv8jaNfklTWFL4Y9dqUHmm40DnGgzqtQYo=; b=TBsLMEyalN0RQxCYQn2cL8kO5lIpf9uF7vFz00kAGELxmfEiL3V0FY1EW/9rBym/Zm D5OI6VuMZcTo0AZbBmIBsasoi0mJCwDu4XM1jyFX03CVDWyyZYA/xPA4b3uNJBtnty7f G4nlIMok/KvHpWx6iwmzwr4l4g3abnXvc8zZFr3YMZWlFRDRB8M7vrNchn6utl1RxIac fX74j6OXqhGFKrQLXT1GBQCkq0FMrzybzCuyo0bcGVwBbSvoUd6MpIAG4j8NLYdVogyS bZnPIyEqB3i2nETSGI/eh6tGKzpPkccqrT5/h9sAImvFTQCyENtT85xeQrVeL7F6KWWA lQJw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=CxbOhQdM; 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 g14-20020aa79f0e000000b005e06c0a9852si9134667pfr.179.2023.03.06.08.03.03; Mon, 06 Mar 2023 08:03:23 -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=CxbOhQdM; 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 S230248AbjCFQBM (ORCPT + 99 others); Mon, 6 Mar 2023 11:01:12 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41330 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230111AbjCFQAd (ORCPT ); Mon, 6 Mar 2023 11:00:33 -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 12A8C2410D; Mon, 6 Mar 2023 08:00:32 -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 05B181FDF9; Mon, 6 Mar 2023 16:00:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1678118430; 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=7NWpiNTTADv8jaNfklTWFL4Y9dqUHmm40DnGgzqtQYo=; b=CxbOhQdM0DmSSvSs4ws3YFEGRCq95427JdDIkqGjr3JXPgm8LNMlSjJzWXVjv7RdiUXlDg 3xK0HI3EBMbwz8QuyLjlRQ85o4TAIKmKFAm2V/3eU6fgvqyTKI34739C/DlpLYlhzJiCk6 fBRiMqqfb+mKNtoN4pn4MOJppqx0ZJU= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1678118430; 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=7NWpiNTTADv8jaNfklTWFL4Y9dqUHmm40DnGgzqtQYo=; b=7ML7Gw2ReccPA0qqrfpdz0dm1kcgFqlbmBv2/WjBRkT6jfoGv9mWpQ59x49OFr1eCw3raH jSq1pImIDYAqu8Dg== 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 A6A4413513; Mon, 6 Mar 2023 16:00:29 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id oPnjJx0OBmQ/PwAAMHmgww (envelope-from ); Mon, 06 Mar 2023 16:00:29 +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 15/99] fbdev/cirrusfb: Duplicate video-mode option string Date: Mon, 6 Mar 2023 16:58:52 +0100 Message-Id: <20230306160016.4459-16-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?1759634892198424429?= X-GMAIL-MSGID: =?utf-8?q?1759634892198424429?= 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/cirrusfb.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/drivers/video/fbdev/cirrusfb.c b/drivers/video/fbdev/cirrusfb.c index ba45e2147c52..fbf9281a7004 100644 --- a/drivers/video/fbdev/cirrusfb.c +++ b/drivers/video/fbdev/cirrusfb.c @@ -2336,10 +2336,20 @@ static int __init cirrusfb_setup(char *options) if (!strcmp(this_opt, "noaccel")) noaccel = 1; - else if (!strncmp(this_opt, "mode:", 5)) - mode_option = this_opt + 5; - else - mode_option = this_opt; + else { + static char mode_option_buf[256]; + int ret; + + if (!strncmp(this_opt, "mode:", 5)) + this_opt += 5; + + ret = snprintf(mode_option_buf, sizeof(mode_option_buf), "%s", this_opt); + if (WARN(ret < 0, "cirrusfb: ignoring invalid option, ret=%d\n", ret)) + continue; + if (WARN(ret >= sizeof(mode_option_buf), "cirrusfb: option too long\n")) + continue; + mode_option = mode_option_buf; + } } return 0; }