From patchwork Mon Mar 6 15:59:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Zimmermann X-Patchwork-Id: 64905 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1935193wrd; Mon, 6 Mar 2023 08:23:47 -0800 (PST) X-Google-Smtp-Source: AK7set+vF5+m7mszrPbrc9spytWJWXZnXW0AhiqunNFp2NZQ/tmrVGYlsBpKyriiyEp8TFg+KJqU X-Received: by 2002:a17:90a:e7c7:b0:236:8e07:4c6d with SMTP id kb7-20020a17090ae7c700b002368e074c6dmr12143837pjb.7.1678119827240; Mon, 06 Mar 2023 08:23:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678119827; cv=none; d=google.com; s=arc-20160816; b=BbfRuUEMfes1iGj4b4pWyYj8Odzanx71FmrlC1aIcrlp3Ub3f0nMGTGBvawG2E6PQk plNbpiwD80wkGyXzY+PZB3nld3SFJorLNmDkxoFTOBpQGnZ4KI0S6jrsMzN6GCKbVDVo FseWrNK/2pIovl3DM0eRLp1CiYEu6DjB2RIIU2AJB+7cb2cJ9omfM1Vv56CNykRsPpKW IraKOxOXELBhwNBWNR60t1xY2yZkKrTe4Hm00J4sRx9VL8EwYpn8td+CVpW6Lo65pD7U 0craJ0ZWdXJtr8sncJwLZsKzRUaVNLsrWg2c51YdABncZBpFlb7ui5ufd+hVGy1BMVbx DpmA== 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=yk8NEEFyYFz7QCOnrJy+3UNVzVnSkFF9rUK/rTVstVw=; b=bEHTqD14vbI8aUsu+q9zjSYbN61YytIg1QiNCrkWicLla6Nn12ghYJ4t/q0JvHpcJL r6QQ6tZ5/Ui2YtavH2t7Ft60E4TAFsKKT3+4WJDq6scyk1Vul/EyazqQMS+GMaW8cy+4 JWFN714HE1wds7KbgyQ1XkLarrkRbGFr88tJRRd8buQq3xv+Rqe5l8mY+BhB/92dHhM+ kNObf26xZn9uPmbna5TA855+chNGpkK/ls8VtIMpJM0UfgfldTxIdx2EnvbWpbDj78wn NTi1/9s3+6FX2Mzo1vCCDcQt2xE3qqY9WP2zabC2hb3qnB5aVxhltK4N6S07HmrBXhfC Aksg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=ipn1oNoL; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519 header.b=iC4cIbwt; 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 z6-20020a17090a170600b00234ac7c8061si11812524pjd.175.2023.03.06.08.23.35; Mon, 06 Mar 2023 08:23:47 -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=ipn1oNoL; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519 header.b=iC4cIbwt; 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 S231592AbjCFQEo (ORCPT + 99 others); Mon, 6 Mar 2023 11:04:44 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42000 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231330AbjCFQAx (ORCPT ); Mon, 6 Mar 2023 11:00:53 -0500 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0FD052A6D2; Mon, 6 Mar 2023 08:00:50 -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 A129322417; Mon, 6 Mar 2023 16:00:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1678118448; 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=yk8NEEFyYFz7QCOnrJy+3UNVzVnSkFF9rUK/rTVstVw=; b=ipn1oNoL8qgLXjs4f4GtU9f/Ri4YDt73X0/TvFnJ79CtWu9n8/hVZ440v9W1mRlrMiJY0m ZaKok8Kf9WW9HIlqjzJnAy1fgeoNTaMoYA5kSIO1mxHfdyxUaObCQYCwdElfxm8sTp+Nrm RIBwLREtIjf+l2gADtz4zYDiixiSOSo= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1678118448; 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=yk8NEEFyYFz7QCOnrJy+3UNVzVnSkFF9rUK/rTVstVw=; b=iC4cIbwtW1r3WfnatTA5zG+AxJ5q1hiAvjhOthUj8zVJkV1RQje56jvLmm06CSUTaLYgih i8qNrh7K62zv6OCA== 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 4CC8513513; Mon, 6 Mar 2023 16:00:48 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id iJjmETAOBmQ/PwAAMHmgww (envelope-from ); Mon, 06 Mar 2023 16:00:48 +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 63/99] fbdev/pvr2fb: Duplicate video-mode option string Date: Mon, 6 Mar 2023 16:59:40 +0100 Message-Id: <20230306160016.4459-64-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?1759636175871522041?= X-GMAIL-MSGID: =?utf-8?q?1759636175871522041?= 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/pvr2fb.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/drivers/video/fbdev/pvr2fb.c b/drivers/video/fbdev/pvr2fb.c index 6888127a5eb8..cd778f8753f1 100644 --- a/drivers/video/fbdev/pvr2fb.c +++ b/drivers/video/fbdev/pvr2fb.c @@ -1049,7 +1049,15 @@ static int __init pvr2fb_setup(char *options) } else if (!strncmp(this_opt, "nowrap", 6)) { nowrap = 1; } else { - mode_option = this_opt; + static char mode_option_buf[256]; + int ret; + + ret = snprintf(mode_option_buf, sizeof(mode_option_buf), "%s", this_opt); + if (WARN(ret < 0, "pvr2fb: ignoring invalid option, ret=%d\n", ret)) + continue; + if (WARN(ret >= sizeof(mode_option_buf), "pvr2fb: option too long\n")) + continue; + mode_option = mode_option_buf; } }