xfs
[Top] [All Lists]

Re: [PATCH] xfsprogs: xfs_quota allow user or group names beginning with

To: rjohnston@xxxxxxx
Subject: Re: [PATCH] xfsprogs: xfs_quota allow user or group names beginning with digits
From: Eric Sandeen <sandeen@xxxxxxxxxxx>
Date: Sun, 21 Apr 2013 00:55:09 -0500
Cc: xfs@xxxxxxxxxxx
Delivered-to: xfs@xxxxxxxxxxx
In-reply-to: <20130417183323.465181485@xxxxxxx>
References: <20130417183323.465181485@xxxxxxx>
User-agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.8; rv:17.0) Gecko/20130328 Thunderbird/17.0.5
On 4/17/13 1:32 PM, rjohnston@xxxxxxx wrote:

<some kind of email that doesn't show up when I hit reply so repasting ;)>

> 
> 
> xfs_quota does not properly parse users or groups that begin with a number.
> Only call atoi when user or group consists of digits only.
> 
> Signed-off-by: Rich Johnston <rjohnston@xxxxxxx>

Seems sane to me.  I'd change i=0 to i = 0, but *shrug*

[xfsprogs]$ grep -r "i = 0" * | wc -l
404
[xfsprogs]$ grep -r "i=0" * | wc -l
10

Other than that,
Reviewed-by: Eric Sandeen <sandeen@xxxxxxxxxx>

> ---
>  include/input.h |    1 +
>  libxcmd/input.c |   12 ++++++++++++
>  quota/quota.c   |    4 ++--
>  quota/quota.h   |    1 +
>  4 files changed, 16 insertions(+), 2 deletions(-)
> 
> Index: b/include/input.h
> ===================================================================
> --- a/include/input.h
> +++ b/include/input.h
> @@ -46,6 +46,7 @@ extern void timestr(struct timeval *tv,
>  extern uid_t uid_from_string(char *user);
>  extern gid_t gid_from_string(char *group);
>  extern prid_t        prid_from_string(char *project);
> +extern boolean_t isdigits_only(const char *str);
>  
>  #define HAVE_FTW_H 1 /* TODO: configure me */
>  
> Index: b/libxcmd/input.c
> ===================================================================
> --- a/libxcmd/input.c
> +++ b/libxcmd/input.c
> @@ -398,6 +398,18 @@ gid_from_string(
>       return -1;
>  }
>  
> +boolean_t isdigits_only(
> +     const char *str)
> +{
> +     int i;
> +
> +     for (i=0; i < strlen(str); i++) {
> +             if (!isdigit(str[i]))
> +                     return B_FALSE;
> +     }
> +     return B_TRUE;
> +}
> +
>  #define HAVE_FTW_H 1 /* TODO: configure me */
>  
>  #ifndef HAVE_FTW_H
> Index: b/quota/quota.c
> ===================================================================
> --- a/quota/quota.c
> +++ b/quota/quota.c
> @@ -224,7 +224,7 @@ quota_user_type(
>       uid_t           id;
>  
>       if (name) {
> -             if (isdigit(name[0])) {
> +             if (isdigits_only(name)) {
>                       id = atoi(name);
>                       name = getusername(id, flags & NO_LOOKUP_FLAG);
>               } else if ((u = getpwnam(name))) {
> @@ -273,7 +273,7 @@ quota_group_type(
>       int             i, ngroups, dofree = 0;
>  
>       if (name) {
> -             if (isdigit(name[0])) {
> +             if (isdigits_only(name)) {
>                       gid = atoi(name);
>                       name = getgroupname(gid, flags & NO_LOOKUP_FLAG);
>               } else {
> Index: b/quota/quota.h
> ===================================================================
> --- a/quota/quota.h
> +++ b/quota/quota.h
> @@ -80,4 +80,5 @@ enum {
>  extern char *uid_to_name(__uint32_t __uid);
>  extern char *gid_to_name(__uint32_t __gid);
>  extern char *prid_to_name(__uint32_t __prid);
> +extern boolean_t isdigits_only(const char *);
>  
> 
> 
> _______________________________________________
> xfs mailing list
> xfs@xxxxxxxxxxx
> http://oss.sgi.com/mailman/listinfo/xfs
> 

<Prev in Thread] Current Thread [Next in Thread>