Message ID | 20230309160201.5163-52-tzimmermann@suse.de |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp389867wrd; Thu, 9 Mar 2023 08:35:49 -0800 (PST) X-Google-Smtp-Source: AK7set9ZH/yN7RqkILJEz4oYh1A1PAOYeYW1gkOBuoZMCluriz5+9rRy2G1DZUxoj4g4A64vPadJ X-Received: by 2002:a05:6a20:918a:b0:c7:249:cd8c with SMTP id v10-20020a056a20918a00b000c70249cd8cmr22988067pzd.5.1678379748812; Thu, 09 Mar 2023 08:35:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678379748; cv=none; d=google.com; s=arc-20160816; b=0kPUbG7nzBRw3zOBVk2Tfq+e69tnCAGSlQkDahdjdHNv0mqI4cGwiyoViV+9/MaKaP qrQPXH8eqwWd/WMxMa6H/ATJUaysVBTAo1Zpkad9NqZJsu3AIppRJ8i5EtmDjhe7AcjT p/C1Hcnz8eQpcPqVv+40vzsVWcGac/EXWuxNhcKTelOBz4MNKTVAv0FOWL826iVFcBpc YYUjW/qNrUbg7FDlFytRM1hXx85vRNN2Aal2G/oLOg0mrTeA8OHcWqwXTS5W1U7rG9xs ziF3v7yWfS6IEGNR6k2tLJ8W0O3G7VBp1rCVF6wZpsEGo0NNJA9phbwUfp3RQn9OVu9+ OM+Q== 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=ivKIUtt4Tv/ceojYymrkPyms/2b1cDfnVVV/f9m3J8k=; b=n2nwqb5wKtnVIEtn8WV3m8QAnifwQ5NbYq1EvPF3m30BuTFBs/QNdaeGWyikYAqul1 6gqZ/+F7+f8MUP389PQv6fuM4RFO16OFadbBKTVAv9/EP5W1m7c2d/0o7eeB217Ubah6 3IfkKJiluPP8wNv24fPv749G3FZqSLRY+KrY0VtLGy3JfzPC/QfYU9O/WwTh1BzGPoBM z/7KHsgTapam+HrXQrYoNoqVdGgu4YHyPh2PsYBlUh/Fylh4J+p3aAzqkFnLwhbhI0P4 Vy3v23tby6ETZRgCjAtapBFw8jWZ/Mxs1bLGKOa8M/7jEEtHH+uV0ns42KPwIHKqouV4 ZlgA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=mL4MJv0b; 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 e15-20020a63f54f000000b00502f13f32c5si8362470pgk.862.2023.03.09.08.35.34; Thu, 09 Mar 2023 08:35:48 -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=mL4MJv0b; 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 S232224AbjCIQHK (ORCPT <rfc822;carlos.wei.hk@gmail.com> + 99 others); Thu, 9 Mar 2023 11:07:10 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47714 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231675AbjCIQC1 (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Thu, 9 Mar 2023 11:02:27 -0500 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ADB3FF3670; Thu, 9 Mar 2023 08:02:26 -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 5C1EC2018C; Thu, 9 Mar 2023 16:02:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1678377745; 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=ivKIUtt4Tv/ceojYymrkPyms/2b1cDfnVVV/f9m3J8k=; b=mL4MJv0b9/9cWbQh2Huq3UG4Eo8alb8Jxflikg/rrO/UqgSji9yPWjJySPlJFuLdfDcCBe TwSj/ZUNlkCxNtQg1hM8tUeuQKwjENbt7ZYYPi5B/ArbYchVv/YcwJd9f591P7oX3ou1w4 Z/IERGkenK/o/YjIIS/fN+Y153in8f8= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1678377745; 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=ivKIUtt4Tv/ceojYymrkPyms/2b1cDfnVVV/f9m3J8k=; b=FBGV+v9pvuBtm0W5ZqsIb7iUwxFCOIG14ZQyJaHqa0MgrEIKaTZ/CGyqNpwvX8nM/GomTx s8dAJpiRsreFunBg== 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 F12661391B; Thu, 9 Mar 2023 16:02:24 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id AETmORADCmQHbgAAMHmgww (envelope-from <tzimmermann@suse.de>); Thu, 09 Mar 2023 16:02:24 +0000 From: Thomas Zimmermann <tzimmermann@suse.de> To: deller@gmx.de, geert+renesas@glider.be, timur@kernel.org, rdunlap@infradead.org, paulus@samba.org, benh@kernel.crashing.org, linux@armlinux.org.uk, pjones@redhat.com, adaplas@gmail.com, s.hauer@pengutronix.de, shawnguo@kernel.org, mbroemme@libmpq.org, thomas@winischhofer.net, James.Bottomley@HansenPartnership.com, sudipm.mukherjee@gmail.com, teddy.wang@siliconmotion.com, corbet@lwn.net Cc: linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Thomas Zimmermann <tzimmermann@suse.de> Subject: [PATCH v2 051/101] fbdev/nvidiafb: Parse option string with struct option_iter Date: Thu, 9 Mar 2023 17:01:11 +0100 Message-Id: <20230309160201.5163-52-tzimmermann@suse.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230309160201.5163-1-tzimmermann@suse.de> References: <20230309160201.5163-1-tzimmermann@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759908723223505533?= X-GMAIL-MSGID: =?utf-8?q?1759908723223505533?= |
Series |
fbdev: Fix memory leak in option parsing
|
|
Commit Message
Thomas Zimmermann
March 9, 2023, 4:01 p.m. UTC
Use struct option_iter to walk over the individual options in the
driver's option string. Replaces the hand-written strsep() loop with
a clean interface. The helpers for struct option_iter handle empty
option strings and empty options transparently. The struct's _init
and _release functions duplicate and release the option string's
memory buffer as needed.
Done in preparation of constifying the option string.
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
---
drivers/video/fbdev/nvidia/nvidia.c | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/drivers/video/fbdev/nvidia/nvidia.c b/drivers/video/fbdev/nvidia/nvidia.c index 8ad4bcff84df..d779163f919a 100644 --- a/drivers/video/fbdev/nvidia/nvidia.c +++ b/drivers/video/fbdev/nvidia/nvidia.c @@ -10,6 +10,7 @@ */ #include <linux/aperture.h> +#include <linux/cmdline.h> #include <linux/module.h> #include <linux/kernel.h> #include <linux/errno.h> @@ -1459,17 +1460,18 @@ static void nvidiafb_remove(struct pci_dev *pd) * ------------------------------------------------------------------------- */ #ifndef MODULE -static int nvidiafb_setup(char *options) +static int nvidiafb_setup(const char *options) { + struct option_iter iter; char *this_opt; NVTRACE_ENTER(); - if (!options || !*options) - return 0; - while ((this_opt = strsep(&options, ",")) != NULL) { + option_iter_init(&iter, options); + + while (option_iter_next(&iter, &this_opt)) { if (!strncmp(this_opt, "forceCRTC", 9)) { - char *p; + const char *p; p = this_opt + 9; if (!*p || !*(++p)) @@ -1505,6 +1507,9 @@ static int nvidiafb_setup(char *options) mode_option = mode_option_buf; } } + + option_iter_release(&iter); + NVTRACE_LEAVE(); return 0; }