From patchwork Mon Mar 6 15:59:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Zimmermann X-Patchwork-Id: 64858 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1923997wrd; Mon, 6 Mar 2023 08:05:09 -0800 (PST) X-Google-Smtp-Source: AK7set8CSYnQUi9Eu/yF7r5DmDJyUox/pC/ZesLCgVAvq9DoqI+e5k8mtggnt8TLYuIPT/YhIZiM X-Received: by 2002:a05:6a21:7886:b0:cd:1ccf:246b with SMTP id bf6-20020a056a21788600b000cd1ccf246bmr9837915pzc.57.1678118708919; Mon, 06 Mar 2023 08:05:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678118708; cv=none; d=google.com; s=arc-20160816; b=iObIDZWMnnTmwRy4CebEe5AwnziTH+4yJdYsdq0/6r9GqiYnjuQYn5JXEAZD3/YkIu e4Ip3clhtc5DOgmYA+ZOmu7yRlmvtcu+b3Cs+EJcuFT83QAl0aiKkc4VdI29m12zIXyt qVpUIoViobkKLBDaK9+u0ApWQNhvKxVBqXgh7DuLHO9ybYVwv7iq2Gr0qOmgFVmU/nA/ ei0tlCdbHPoVWqxVvIjujAmWmehTENqiAVa4YNF4RuMIsewf1Ehw4U4TF8vbOg63xn2d S2uu1pXfmWDN8HKq/MwQOVDx4S5scsBqFZ2xskgEduNS8GVfiDeyR3Ht1PuEoVvX+7V3 gZsQ== 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=5xZuWufF0BKBnJgqnmUzO92Agzss6jwSfAKczEAHKgw=; b=wraH0F8U6ns8kMHhl/3ah0ZOo/UH3vtY6EM486hBsPo/ZPYviQkwSaKEi+cy4fxJnr q59pzkhb7aLH5xqEjPJDVxKUsr2Tr01FgQIydcMZ/BuZpHIuaamu0EMbnvcgBd6lP0iT jmB6YRnWqs3qiJYrndpuBtRMaViFr/mkZGHDLKpBGGR1L0UguHihmnITPM3oY0FSmw4s zKkIaa71XWif18LKKbQJDT3rPac67n9ZGLgyZoc5gUztwgrqnWQiYEmyU9QC6X9eRIvb MgkCJtiEtiQSvm8OHhkAkK3ljQTga3KhHsIOZscjYWjpwdCY/QVe+QO+Y1SpYXL5v8YX 7ZgQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=Ri+OkwPp; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519 header.b=aqrGuidr; 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 t23-20020a63eb17000000b0050327dc5ff4si9545918pgh.67.2023.03.06.08.04.55; Mon, 06 Mar 2023 08:05:08 -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=Ri+OkwPp; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519 header.b=aqrGuidr; 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 S231256AbjCFQEG (ORCPT + 99 others); Mon, 6 Mar 2023 11:04:06 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41664 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231178AbjCFQAr (ORCPT ); Mon, 6 Mar 2023 11:00:47 -0500 Received: from smtp-out1.suse.de (smtp-out1.suse.de [IPv6:2001:67c:2178:6::1c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EF54F30195; Mon, 6 Mar 2023 08:00:45 -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 5973E223F9; Mon, 6 Mar 2023 16:00:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1678118444; 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=5xZuWufF0BKBnJgqnmUzO92Agzss6jwSfAKczEAHKgw=; b=Ri+OkwPppiCoGP9RFfeKBJINJh8GGPK6sO/aql/OWm+N8e38md54yG1eM8FoghdD0HGk4u 98L3izBlLDXHA0Fkb9m1lGhvHOU9rH+lV2sURp1LZLRPC8osURiIGBD14qdloYQD/O9oew ZaOjvQeKFDdzqG5HgOkl2SqHrxtvyOw= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1678118444; 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=5xZuWufF0BKBnJgqnmUzO92Agzss6jwSfAKczEAHKgw=; b=aqrGuidrSFqrQf7eR1g3H2MBDl0S41CbUCmCHHRkWYuQ5h3+tMTkJShxYePoVy3k1lhxoG itYNAd1KxDdLOyDA== 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 00BD513A6A; Mon, 6 Mar 2023 16:00:43 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id WPrbOisOBmQ/PwAAMHmgww (envelope-from ); Mon, 06 Mar 2023 16:00:43 +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 52/99] fbdev/ocfb: Duplicate video-mode option string Date: Mon, 6 Mar 2023 16:59:29 +0100 Message-Id: <20230306160016.4459-53-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?1759635003145480280?= X-GMAIL-MSGID: =?utf-8?q?1759635003145480280?= 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/ocfb.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/drivers/video/fbdev/ocfb.c b/drivers/video/fbdev/ocfb.c index da7e1457e58f..34684191f2f0 100644 --- a/drivers/video/fbdev/ocfb.c +++ b/drivers/video/fbdev/ocfb.c @@ -75,9 +75,18 @@ static int __init ocfb_setup(char *options) return 0; while ((curr_opt = strsep(&options, ",")) != NULL) { + static char mode_option_buf[256]; + int ret; + if (!*curr_opt) continue; - mode_option = curr_opt; + + ret = snprintf(mode_option_buf, sizeof(mode_option_buf), "%s", curr_opt); + if (WARN(ret < 0, "ocfb: ignoring invalid option, ret=%d\n", ret)) + continue; + if (WARN(ret >= sizeof(mode_option_buf), "ocfb: option too long\n")) + continue; + mode_option = mode_option_buf; } return 0;