From patchwork Mon Mar 6 15:59:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Zimmermann X-Patchwork-Id: 64901 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1935123wrd; Mon, 6 Mar 2023 08:23:38 -0800 (PST) X-Google-Smtp-Source: AK7set8/E6X9jn2gpVmq9lfxbILeghJ/Fvht1yot7/7QLXrtTEM6lDRSgX6hX2phrARluIRY4TlY X-Received: by 2002:a17:90b:4a85:b0:237:b5d4:c0cc with SMTP id lp5-20020a17090b4a8500b00237b5d4c0ccmr11693087pjb.39.1678119817893; Mon, 06 Mar 2023 08:23:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678119817; cv=none; d=google.com; s=arc-20160816; b=wRs7wIWdjkCfDUlOc4dkf4C52JoV0FsowZFBA94L1oPIhhzkRnzorYyqVreKprqKa9 QYPJRY+ds9769YJuyC4g8sqIw6RLRTgXKWTrAsIOqzxzwAEkXwtEtzRHbbM2tiQ+4Kop 71wVefJiZUaI7pgQoctTUzdSgvf958+WADnzS9wbOiCLhMhtmKLco9qkXXU1+4RT8XNn CqCHqKQrQJtiElaHjW5k8EIbGGIBzKXyPh6PYc70JJuDqgMhw/Ek4mOrb/236J4UK30D LwwkaY1rm2f9K2uEtbZobll906DQesWApNHgZhmM6Qgyq9KoDKNnidUCpjhSzYcEsEw4 N+Rw== 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=MS+PFmaqiOmf95A5S5Zq6/GUizF4f5fYETWFaMoxpps=; b=fRN2nd4C/HSdD2rSb58Og40gAbiIm/QpB/vGdnhcxnzzTAfIEuLmdUEqBLnijogEUy ALqzZc7zpW5IKjsGEkE1epdWJ5iFQk168Xk3w0WjsvvtYPhMsqr15vKvEbzifehFFjsQ er3yQH6dBx9ScjvZrBCl7/3tRiFev6necT1nI9QpLXZlx0z+SEIldrVwWOzNUcToL0W5 G8ulvhsA6KHzwjt0WZHzH42bKdQDfFZBDfcMVm3u/vXcQ9IDkWs2ahGVNXsMMnnmwk8i bY8p1NxmaEbhBvj87ac3ssaeOQTnodOTynqJGoD2QG3PLcGB8yL3aD4mnhPruOz5DlmV S/bw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=eyAcjdzD; 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 p12-20020a17090a74cc00b0023761783876si9846482pjl.103.2023.03.06.08.23.24; Mon, 06 Mar 2023 08:23:37 -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=eyAcjdzD; 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 S229785AbjCFQEM (ORCPT + 99 others); Mon, 6 Mar 2023 11:04:12 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41678 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231263AbjCFQAt (ORCPT ); Mon, 6 Mar 2023 11:00:49 -0500 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 65FD32E0D3; Mon, 6 Mar 2023 08:00:48 -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 218AB1FEB6; Mon, 6 Mar 2023 16:00:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1678118447; 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=MS+PFmaqiOmf95A5S5Zq6/GUizF4f5fYETWFaMoxpps=; b=eyAcjdzDglmtF4oh1f0MNlaik2bGJgNkrgTFv1LJfMo4v1hE2CKxGYM9r1k5sOmX1luf0b Pt6wK2chtkXQCnXhJq+hJN4v3enn9riFmiEEq9S+7RuJSjKCBFMXzAvoC6vT205OWvaiJ0 1Ln1Nod3dTOz4yy9dnVEH86cOCkZLaw= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1678118447; 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=MS+PFmaqiOmf95A5S5Zq6/GUizF4f5fYETWFaMoxpps=; b=nuUXLk2Pj692pTF+R3MQ78A7dHt9zUtyxTUn/qqQKTI7goCHVs9q8w74qYk1XVpRrUC1dB OGeaL7bNptKdhkAA== 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 B846313513; Mon, 6 Mar 2023 16:00:46 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id cIAfLC4OBmQ/PwAAMHmgww (envelope-from ); Mon, 06 Mar 2023 16:00:46 +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 59/99] fbdev/pm3fb: Duplicate video-mode option string Date: Mon, 6 Mar 2023 16:59:36 +0100 Message-Id: <20230306160016.4459-60-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?1759636166457749922?= X-GMAIL-MSGID: =?utf-8?q?1759636166457749922?= 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/pm3fb.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/drivers/video/fbdev/pm3fb.c b/drivers/video/fbdev/pm3fb.c index b46a471df9ae..d0a2cf623c60 100644 --- a/drivers/video/fbdev/pm3fb.c +++ b/drivers/video/fbdev/pm3fb.c @@ -1526,8 +1526,17 @@ static int __init pm3fb_setup(char *options) hwcursor = simple_strtoul(this_opt + 9, NULL, 0); else if (!strncmp(this_opt, "nomtrr", 6)) nomtrr = 1; - 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, "pm3fb: ignoring invalid option, ret=%d\n", ret)) + continue; + if (WARN(ret >= sizeof(mode_option_buf), "pm3fb: option too long\n")) + continue; + mode_option = mode_option_buf; + } } return 0; }