From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 11804C2D0C5 for ; Tue, 10 Dec 2019 12:33:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D070A20838 for ; Tue, 10 Dec 2019 12:33:05 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="gW8aevfD" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727440AbfLJMdE (ORCPT ); Tue, 10 Dec 2019 07:33:04 -0500 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:44075 "EHLO us-smtp-delivery-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727534AbfLJMbY (ORCPT ); Tue, 10 Dec 2019 07:31:24 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1575981082; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=pbuioiTmP93KKwpWyEIdQ0CrRNe0alBu/p/cHpWJ9C8=; b=gW8aevfD2hawBoemJlEQ2Fq+YSsgbhBJbFWfVtOYzsrDr6EcNhJgEV2aswqvHl0kK5FSwo 6C1bYU3W86zci1xyuoy4+dmwiheF6C6dVmRY/0+GxBpM/8bGs2uogMt8tYoiSmiB+J5dTC kTvNW99IamhbLF7rzuiHiGC8melBCyw= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-156-OLxBFU2aO6ud1PpJV3SavQ-1; Tue, 10 Dec 2019 07:31:19 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C57F0107ACC7; Tue, 10 Dec 2019 12:31:17 +0000 (UTC) Received: from coeurl.usersys.redhat.com (ovpn-123-90.rdu2.redhat.com [10.10.123.90]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8F4635C21B; Tue, 10 Dec 2019 12:31:17 +0000 (UTC) Received: by coeurl.usersys.redhat.com (Postfix, from userid 1000) id 0105320C3B; Tue, 10 Dec 2019 07:31:15 -0500 (EST) From: Scott Mayhew To: anna.schumaker@netapp.com, trond.myklebust@hammerspace.com Cc: dhowells@redhat.com, viro@zeniv.linux.org.uk, linux-nfs@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-security-module@vger.kernel.org Subject: [PATCH v6 21/27] NFS: Add a small buffer in nfs_fs_context to avoid string dup Date: Tue, 10 Dec 2019 07:31:09 -0500 Message-Id: <20191210123115.1655-22-smayhew@redhat.com> In-Reply-To: <20191210123115.1655-1-smayhew@redhat.com> References: <20191210123115.1655-1-smayhew@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-MC-Unique: OLxBFU2aO6ud1PpJV3SavQ-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org From: David Howells Add a small buffer in nfs_fs_context to avoid string duplication when parsing numbers. Also make the parsing function wrapper place the parsed integer directly in the appropriate nfs_fs_context struct member. Signed-off-by: David Howells Signed-off-by: Al Viro --- fs/nfs/fs_context.c | 98 +++++++++++++++++++++------------------------ fs/nfs/internal.h | 2 + 2 files changed, 48 insertions(+), 52 deletions(-) diff --git a/fs/nfs/fs_context.c b/fs/nfs/fs_context.c index 92a1e4bd9133..2921c5820c31 100644 --- a/fs/nfs/fs_context.c +++ b/fs/nfs/fs_context.c @@ -468,27 +468,38 @@ static int nfs_get_option_str(substring_t args[], cha= r **option) =09return !*option; } =20 -static int nfs_get_option_ul(substring_t args[], unsigned long *option) +static int nfs_get_option_ui(struct nfs_fs_context *ctx, +=09=09=09 substring_t args[], unsigned int *option) { -=09int rc; -=09char *string; +=09match_strlcpy(ctx->buf, args, sizeof(ctx->buf)); +=09return kstrtouint(ctx->buf, 10, option); +} =20 -=09string =3D match_strdup(args); -=09if (string =3D=3D NULL) -=09=09return -ENOMEM; -=09rc =3D kstrtoul(string, 10, option); -=09kfree(string); +static int nfs_get_option_ui_bound(struct nfs_fs_context *ctx, +=09=09=09=09 substring_t args[], unsigned int *option, +=09=09=09=09 unsigned int l_bound, unsigned u_bound) +{ +=09int ret; =20 -=09return rc; +=09match_strlcpy(ctx->buf, args, sizeof(ctx->buf)); +=09ret =3D kstrtouint(ctx->buf, 10, option); +=09if (ret < 0) +=09=09return ret; +=09if (*option < l_bound || *option > u_bound) +=09=09return -ERANGE; +=09return 0; } =20 -static int nfs_get_option_ul_bound(substring_t args[], unsigned long *opti= on, -=09=09unsigned long l_bound, unsigned long u_bound) +static int nfs_get_option_us_bound(struct nfs_fs_context *ctx, +=09=09=09=09 substring_t args[], unsigned short *option, +=09=09=09=09 unsigned short l_bound, +=09=09=09=09 unsigned short u_bound) { =09int ret; =20 -=09ret =3D nfs_get_option_ul(args, option); -=09if (ret !=3D 0) +=09match_strlcpy(ctx->buf, args, sizeof(ctx->buf)); +=09ret =3D kstrtou16(ctx->buf, 10, option); +=09if (ret < 0) =09=09return ret; =09if (*option < l_bound || *option > u_bound) =09=09return -ERANGE; @@ -501,7 +512,6 @@ static int nfs_get_option_ul_bound(substring_t args[], = unsigned long *option, static int nfs_fs_context_parse_option(struct nfs_fs_context *ctx, char *p= ) { =09substring_t args[MAX_OPT_ARGS]; -=09unsigned long option; =09char *string; =09int token, rc; =20 @@ -609,86 +619,70 @@ static int nfs_fs_context_parse_option(struct nfs_fs_= context *ctx, char *p) =09=09 * options that take numeric values =09=09 */ =09case Opt_port: -=09=09if (nfs_get_option_ul(args, &option) || -=09=09 option > USHRT_MAX) +=09=09if (nfs_get_option_ui_bound(ctx, args, &ctx->nfs_server.port, +=09=09=09=09=09 0, USHRT_MAX)) =09=09=09goto out_invalid_value; -=09=09ctx->nfs_server.port =3D option; =09=09break; =09case Opt_rsize: -=09=09if (nfs_get_option_ul(args, &option)) +=09=09if (nfs_get_option_ui(ctx, args, &ctx->rsize)) =09=09=09goto out_invalid_value; -=09=09ctx->rsize =3D option; =09=09break; =09case Opt_wsize: -=09=09if (nfs_get_option_ul(args, &option)) +=09=09if (nfs_get_option_ui(ctx, args, &ctx->wsize)) =09=09=09goto out_invalid_value; -=09=09ctx->wsize =3D option; =09=09break; =09case Opt_bsize: -=09=09if (nfs_get_option_ul(args, &option)) +=09=09if (nfs_get_option_ui(ctx, args, &ctx->bsize)) =09=09=09goto out_invalid_value; -=09=09ctx->bsize =3D option; =09=09break; =09case Opt_timeo: -=09=09if (nfs_get_option_ul_bound(args, &option, 1, INT_MAX)) +=09=09if (nfs_get_option_ui_bound(ctx, args, &ctx->timeo, 1, INT_MAX)) =09=09=09goto out_invalid_value; -=09=09ctx->timeo =3D option; =09=09break; =09case Opt_retrans: -=09=09if (nfs_get_option_ul_bound(args, &option, 0, INT_MAX)) +=09=09if (nfs_get_option_ui_bound(ctx, args, &ctx->retrans, 0, INT_MAX)) =09=09=09goto out_invalid_value; -=09=09ctx->retrans =3D option; =09=09break; =09case Opt_acregmin: -=09=09if (nfs_get_option_ul(args, &option)) +=09=09if (nfs_get_option_ui(ctx, args, &ctx->acregmin)) =09=09=09goto out_invalid_value; -=09=09ctx->acregmin =3D option; =09=09break; =09case Opt_acregmax: -=09=09if (nfs_get_option_ul(args, &option)) +=09=09if (nfs_get_option_ui(ctx, args, &ctx->acregmax)) =09=09=09goto out_invalid_value; -=09=09ctx->acregmax =3D option; =09=09break; =09case Opt_acdirmin: -=09=09if (nfs_get_option_ul(args, &option)) +=09=09if (nfs_get_option_ui(ctx, args, &ctx->acdirmin)) =09=09=09goto out_invalid_value; -=09=09ctx->acdirmin =3D option; =09=09break; =09case Opt_acdirmax: -=09=09if (nfs_get_option_ul(args, &option)) +=09=09if (nfs_get_option_ui(ctx, args, &ctx->acdirmax)) =09=09=09goto out_invalid_value; -=09=09ctx->acdirmax =3D option; =09=09break; =09case Opt_actimeo: -=09=09if (nfs_get_option_ul(args, &option)) +=09=09if (nfs_get_option_ui(ctx, args, &ctx->acdirmax)) =09=09=09goto out_invalid_value; =09=09ctx->acregmin =3D ctx->acregmax =3D -=09=09=09ctx->acdirmin =3D ctx->acdirmax =3D option; +=09=09=09ctx->acdirmin =3D ctx->acdirmax; =09=09break; =09case Opt_namelen: -=09=09if (nfs_get_option_ul(args, &option)) +=09=09if (nfs_get_option_ui(ctx, args, &ctx->namlen)) =09=09=09goto out_invalid_value; -=09=09ctx->namlen =3D option; =09=09break; =09case Opt_mountport: -=09=09if (nfs_get_option_ul(args, &option) || -=09=09 option > USHRT_MAX) +=09=09if (nfs_get_option_ui_bound(ctx, args, &ctx->mount_server.port, +=09=09=09=09=09 0, USHRT_MAX)) =09=09=09goto out_invalid_value; -=09=09ctx->mount_server.port =3D option; =09=09break; =09case Opt_mountvers: -=09=09if (nfs_get_option_ul(args, &option) || -=09=09 option < NFS_MNT_VERSION || -=09=09 option > NFS_MNT3_VERSION) +=09=09if (nfs_get_option_ui_bound(ctx, args, &ctx->mount_server.version, +=09=09=09=09=09 NFS_MNT_VERSION, NFS_MNT3_VERSION)) =09=09=09goto out_invalid_value; -=09=09ctx->mount_server.version =3D option; =09=09break; =09case Opt_minorversion: -=09=09if (nfs_get_option_ul(args, &option)) -=09=09=09goto out_invalid_value; -=09=09if (option > NFS4_MAX_MINOR_VERSION) +=09=09if (nfs_get_option_ui_bound(ctx, args, &ctx->minorversion, +=09=09=09=09=09 0, NFS4_MAX_MINOR_VERSION)) =09=09=09goto out_invalid_value; -=09=09ctx->minorversion =3D option; =09=09break; =20 =09=09/* @@ -820,9 +814,9 @@ static int nfs_fs_context_parse_option(struct nfs_fs_co= ntext *ctx, char *p) =09=09=09goto out_invalid_address; =09=09break; =09case Opt_nconnect: -=09=09if (nfs_get_option_ul_bound(args, &option, 1, NFS_MAX_CONNECTIONS)) +=09=09if (nfs_get_option_us_bound(ctx, args, &ctx->nfs_server.nconnect, +=09=09=09=09=09 1, NFS_MAX_CONNECTIONS)) =09=09=09goto out_invalid_value; -=09=09ctx->nfs_server.nconnect =3D option; =09=09break; =09case Opt_lookupcache: =09=09string =3D match_strdup(args); diff --git a/fs/nfs/internal.h b/fs/nfs/internal.h index d0abc7b65cd2..5342f3e4d565 100644 --- a/fs/nfs/internal.h +++ b/fs/nfs/internal.h @@ -122,6 +122,8 @@ struct nfs_fs_context { =20 =09void=09=09=09*lsm_opts; =09struct net=09=09*net; + +=09char=09=09=09buf[32];=09/* Parse buffer */ }; =20 /* mount_clnt.c */ --=20 2.17.2