Received: by 2002:a05:7412:98c1:b0:fa:551:50a7 with SMTP id kc1csp327158rdb; Fri, 5 Jan 2024 11:04:40 -0800 (PST) X-Google-Smtp-Source: AGHT+IF7U1+nDRpA1ncIfpnBFRqymcpxdIJw3xLsiDM6Thr+JOsz6wgaz09cu4x281c6u/cjAmUt X-Received: by 2002:a05:6214:1248:b0:67f:5bc7:a310 with SMTP id r8-20020a056214124800b0067f5bc7a310mr3050593qvv.49.1704481480271; Fri, 05 Jan 2024 11:04:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704481480; cv=none; d=google.com; s=arc-20160816; b=Ej2EvfUcp6NtlsfBlztaSxk8VNP1ySKueUun6iRRhiQjNlxB1Obx1nX97H7CYryjQR MS76TyqFp0XUZRP1SLFfr8X7ercQ6sjz6Qdy5HFzPqV2UH0FyLfX77ieN/DK5zdHZeRR w+4OSsWLPTa2hLABoNXEivXkKcxau5E3owfVm22ji+I9m4jPv4g+NuNwniXdD7sqXNs8 Y0CMn1OdhBwqDedjlb6JD1rcIm/PcRC5ecqiPRVLepmtQixUgl/+NfIVTv02ziCbB6v9 6Wdm0HjNUNHAngF6P1SYmPn6E0Vty6ITPNwtCnJj6dYFLwUJ2ycancYNKg9i/Jd9KDD9 92SA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=user-agent:in-reply-to:content-disposition:mime-version :list-unsubscribe:list-subscribe:list-id:precedence:references :reply-to:message-id:subject:cc:to:from:date; bh=kEs1PJC8zQLukS9pwm9nDVyAZgcD0VZx9e6QXWv+JuA=; fh=cD3CfsJm8A65D166h9QapxSz2StztaFbA39pwjMCXPc=; b=okFaR1RGa4adhiXahdZ8urw5B8zdBqocm9l78N0J84v1Ew30SlQS3hE5bU65cZJcLg 1CgOw7rEcwimjgzfGZg7HsXMj7ET1cCOqRdik8iNOle35JtURQJclHM/X0YbQeixoUjF tBWC3TY91izN7F0p/xk683tazM7RfySLA8JkcUUw6qrPxnM6I9eC/wJG3vuuAc1gpQ46 FdPu8Ghu3eHjBJ3MoRdoL5pESXs7rhe9svxipq0daPi7xn3JM8vYWGqdT1vxRunNOZz5 MmGXhmWpwjj4pXJzycI2HHup/p/YYngTwxmRedtXO5uIl6KIqR8Ky8XrmmUxShbaulzX a+xw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel+bounces-18285-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-18285-linux.lists.archive=gmail.com@vger.kernel.org" Return-Path: Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [2604:1380:45d1:ec00::1]) by mx.google.com with ESMTPS id q10-20020a05620a0d8a00b007815c45ec38si2472737qkl.517.2024.01.05.11.04.40 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Jan 2024 11:04:40 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-18285-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel+bounces-18285-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-18285-linux.lists.archive=gmail.com@vger.kernel.org" Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id 0AD811C23630 for ; Fri, 5 Jan 2024 19:04:40 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 838F936099; Fri, 5 Jan 2024 19:04:18 +0000 (UTC) X-Original-To: linux-kernel@vger.kernel.org Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 64FA736083; Fri, 5 Jan 2024 19:04:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=suse.cz Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.cz Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id C028A1F8B3; Fri, 5 Jan 2024 19:04:14 +0000 (UTC) Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 9D608136F5; Fri, 5 Jan 2024 19:04:14 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id A546Jq5SmGWgZwAAD6G6ig (envelope-from ); Fri, 05 Jan 2024 19:04:14 +0000 Date: Fri, 5 Jan 2024 20:04:02 +0100 From: David Sterba To: Qu Wenruo Cc: linux-btrfs@vger.kernel.org, linux-kernel@vger.kernel.org, akpm@linux-foundation.org, christophe.jaillet@wanadoo.fr, andriy.shevchenko@linux.intel.com, David.Laight@ACULAB.COM, ddiss@suse.de, geert@linux-m68k.org, rdunlap@infradead.org Subject: Re: [PATCH v4 4/4] btrfs: migrate to the newer memparse_safe() helper Message-ID: <20240105190402.GA28693@suse.cz> Reply-To: dsterba@suse.cz References: <0c006657fd7d5d923e135bdd4cecc5bcf6a01451.1704422015.git.wqu@suse.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <0c006657fd7d5d923e135bdd4cecc5bcf6a01451.1704422015.git.wqu@suse.com> User-Agent: Mutt/1.5.23.1-rc1 (2014-03-12) X-Spam-Level: X-Spam-Level: Authentication-Results: smtp-out2.suse.de; none X-Rspamd-Server: rspamd2.dmz-prg2.suse.org X-Spamd-Result: default: False [-4.00 / 50.00]; REPLY(-4.00)[] X-Spam-Score: -4.00 X-Rspamd-Queue-Id: C028A1F8B3 X-Spam-Flag: NO On Fri, Jan 05, 2024 at 01:05:02PM +1030, Qu Wenruo wrote: > The new helper has better error report and correct overflow detection, > furthermore the old @retptr behavior is also kept, thus there should be > no behavior change. > > Signed-off-by: Qu Wenruo > Reviewed-by: David Disseldorp > --- > fs/btrfs/ioctl.c | 6 +++++- > fs/btrfs/super.c | 9 ++++++++- > fs/btrfs/sysfs.c | 14 +++++++++++--- > 3 files changed, 24 insertions(+), 5 deletions(-) > > diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c > index 4e50b62db2a8..cb63f50a2078 100644 > --- a/fs/btrfs/ioctl.c > +++ b/fs/btrfs/ioctl.c > @@ -1175,7 +1175,11 @@ static noinline int btrfs_ioctl_resize(struct file *file, > mod = 1; > sizestr++; > } > - new_size = memparse(sizestr, &retptr); > + > + ret = memparse_safe(sizestr, MEMPARSE_SUFFIXES_DEFAULT, > + &new_size, &retptr); > + if (ret < 0) > + goto out_finish; > if (*retptr != '\0' || new_size == 0) { > ret = -EINVAL; > goto out_finish; > diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c > index 3a677b808f0f..0f29fd692e0f 100644 > --- a/fs/btrfs/super.c > +++ b/fs/btrfs/super.c > @@ -263,6 +263,8 @@ static int btrfs_parse_param(struct fs_context *fc, struct fs_parameter *param) > { > struct btrfs_fs_context *ctx = fc->fs_private; > struct fs_parse_result result; > + /* Only for memparse_safe() caller. */ Please drop the comment.