public inbox for linux-xfs@vger.kernel.org
 help / color / mirror / Atom feed
* [V2] xfsprogs: xfs_quota allow user or group names beginning with digits
@ 2013-04-22 13:31 rjohnston
  2013-04-22 16:18 ` Chandra Seetharaman
  0 siblings, 1 reply; 3+ messages in thread
From: rjohnston @ 2013-04-22 13:31 UTC (permalink / raw)
  To: xfs

[-- Attachment #1: V2-xfsprogs-xfs_quota-allow-user-or-group-names-beginning-with-digits.patch --]
[-- Type: text/plain, Size: 3235 bytes --]

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@sgi.com>
Reviewed-by: Eric Sandeen <sandeen@redhat.com>

---
V2:
	Change 'i=0' to 'i = 0' (sandeen suggestion) 
	Use bool instead of boolean_t (dchinner suggestion)

include/input.h |    1 +
 libxcmd/input.c |   12 ++++++++++++
 quota/quota.c   |    4 ++--
 quota/quota.h   |    1 +
 4 files changed, 16 insertions(+), 2 deletions(-)

Index: xfsprogs/include/input.h
===================================================================
--- xfsprogs.orig/include/input.h	2013-03-22 14:22:09.000000000 -0500
+++ xfsprogs/include/input.h	2013-04-22 08:10:56.000000000 -0500
@@ -22,6 +22,7 @@
 #include <grp.h>
 #include <sys/types.h>
 #include <xfs/project.h>
+#include <stdbool.h>
 
 extern char	**breakline(char *input, int *count);
 extern void	doneline(char *input, char **vec);
@@ -46,6 +47,7 @@
 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 bool	isdigits_only(const char *str);
 
 #define HAVE_FTW_H 1	/* TODO: configure me */
 
Index: xfsprogs/libxcmd/input.c
===================================================================
--- xfsprogs.orig/libxcmd/input.c	2013-03-22 14:22:09.000000000 -0500
+++ xfsprogs/libxcmd/input.c	2013-04-22 08:07:01.000000000 -0500
@@ -19,6 +19,7 @@
 #include <xfs/xfs.h>
 #include <xfs/input.h>
 #include <ctype.h>
+#include <stdbool.h>
 
 #if defined(ENABLE_READLINE)
 # include <readline/history.h>
@@ -398,6 +399,18 @@
 	return -1;
 }
 
+bool isdigits_only(
+	const char *str)
+{
+	int i;
+
+	for (i = 0; i < strlen(str); i++) {
+		if (!isdigit(str[i]))
+			return false;
+	}
+	return true;
+}
+
 #define HAVE_FTW_H 1	/* TODO: configure me */
 
 #ifndef HAVE_FTW_H
Index: xfsprogs/quota/quota.c
===================================================================
--- xfsprogs.orig/quota/quota.c	2013-03-22 14:22:09.000000000 -0500
+++ xfsprogs/quota/quota.c	2013-04-22 07:20:52.000000000 -0500
@@ -224,7 +224,7 @@
 	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 @@
 	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: xfsprogs/quota/quota.h
===================================================================
--- xfsprogs.orig/quota/quota.h	2013-03-22 14:22:09.000000000 -0500
+++ xfsprogs/quota/quota.h	2013-04-22 08:12:26.000000000 -0500
@@ -19,6 +19,7 @@
 #include <xfs/xqm.h>
 #include <xfs/path.h>
 #include <xfs/project.h>
+#include <stdbool.h>
 
 /*
  * Different forms of XFS quota
@@ -80,4 +81,5 @@
 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 bool isdigits_only(const char *);
 


_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

^ permalink raw reply	[flat|nested] 3+ messages in thread
* Re: [V2] xfsprogs: xfs_quota allow user or group names beginning with digits
  2013-04-22 13:31 [V2] xfsprogs: xfs_quota allow user or group names beginning with digits rjohnston
@ 2013-04-22 16:18 ` Chandra Seetharaman
  2013-04-22 16:39   ` Rich Johnston
  0 siblings, 1 reply; 3+ messages in thread
From: Chandra Seetharaman @ 2013-04-22 16:18 UTC (permalink / raw)
  To: rjohnston; +Cc: xfs


Is there any specific reason why quota_proj_type() is not changed ?

On Mon, 2013-04-22 at 08:31 -0500, rjohnston@sgi.com wrote:
> plain text document attachment
> (V2-xfsprogs-xfs_quota-allow-user-or-group-names-beginning-with-digits.patch)
> 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@sgi.com>
> Reviewed-by: Eric Sandeen <sandeen@redhat.com>
> 
> ---
> V2:
> 	Change 'i=0' to 'i = 0' (sandeen suggestion) 
> 	Use bool instead of boolean_t (dchinner suggestion)
> 
> include/input.h |    1 +
>  libxcmd/input.c |   12 ++++++++++++
>  quota/quota.c   |    4 ++--
>  quota/quota.h   |    1 +
>  4 files changed, 16 insertions(+), 2 deletions(-)
> 
> Index: xfsprogs/include/input.h
> ===================================================================
> --- xfsprogs.orig/include/input.h	2013-03-22 14:22:09.000000000 -0500
> +++ xfsprogs/include/input.h	2013-04-22 08:10:56.000000000 -0500
> @@ -22,6 +22,7 @@
>  #include <grp.h>
>  #include <sys/types.h>
>  #include <xfs/project.h>
> +#include <stdbool.h>
> 
>  extern char	**breakline(char *input, int *count);
>  extern void	doneline(char *input, char **vec);
> @@ -46,6 +47,7 @@
>  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 bool	isdigits_only(const char *str);
> 
>  #define HAVE_FTW_H 1	/* TODO: configure me */
> 
> Index: xfsprogs/libxcmd/input.c
> ===================================================================
> --- xfsprogs.orig/libxcmd/input.c	2013-03-22 14:22:09.000000000 -0500
> +++ xfsprogs/libxcmd/input.c	2013-04-22 08:07:01.000000000 -0500
> @@ -19,6 +19,7 @@
>  #include <xfs/xfs.h>
>  #include <xfs/input.h>
>  #include <ctype.h>
> +#include <stdbool.h>
> 
>  #if defined(ENABLE_READLINE)
>  # include <readline/history.h>
> @@ -398,6 +399,18 @@
>  	return -1;
>  }
> 
> +bool isdigits_only(
> +	const char *str)
> +{
> +	int i;
> +
> +	for (i = 0; i < strlen(str); i++) {
> +		if (!isdigit(str[i]))
> +			return false;
> +	}
> +	return true;
> +}
> +
>  #define HAVE_FTW_H 1	/* TODO: configure me */
> 
>  #ifndef HAVE_FTW_H
> Index: xfsprogs/quota/quota.c
> ===================================================================
> --- xfsprogs.orig/quota/quota.c	2013-03-22 14:22:09.000000000 -0500
> +++ xfsprogs/quota/quota.c	2013-04-22 07:20:52.000000000 -0500
> @@ -224,7 +224,7 @@
>  	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 @@
>  	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: xfsprogs/quota/quota.h
> ===================================================================
> --- xfsprogs.orig/quota/quota.h	2013-03-22 14:22:09.000000000 -0500
> +++ xfsprogs/quota/quota.h	2013-04-22 08:12:26.000000000 -0500
> @@ -19,6 +19,7 @@
>  #include <xfs/xqm.h>
>  #include <xfs/path.h>
>  #include <xfs/project.h>
> +#include <stdbool.h>
> 
>  /*
>   * Different forms of XFS quota
> @@ -80,4 +81,5 @@
>  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 bool isdigits_only(const char *);
> 
> 
> 
> _______________________________________________
> xfs mailing list
> xfs@oss.sgi.com
> http://oss.sgi.com/mailman/listinfo/xfs
> 


_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

^ permalink raw reply	[flat|nested] 3+ messages in thread
* Re: [V2] xfsprogs: xfs_quota allow user or group names beginning with digits
  2013-04-22 16:18 ` Chandra Seetharaman
@ 2013-04-22 16:39   ` Rich Johnston
  0 siblings, 0 replies; 3+ messages in thread
From: Rich Johnston @ 2013-04-22 16:39 UTC (permalink / raw)
  To: sekharan; +Cc: xfs

On 04/22/2013 11:18 AM, Chandra Seetharaman wrote:
>
> Is there any specific reason why quota_proj_type() is not changed ?
>
Yes project quota's were being punished. ;)
Good catch Chandra, I will submit a V3.

3 times seems to be the charm on patches. :D

Thanks
--Rich

> On Mon, 2013-04-22 at 08:31 -0500, rjohnston@sgi.com wrote:

>> Index: xfsprogs/quota/quota.c
>> ===================================================================
>> --- xfsprogs.orig/quota/quota.c	2013-03-22 14:22:09.000000000 -0500
>> +++ xfsprogs/quota/quota.c	2013-04-22 07:20:52.000000000 -0500
>> @@ -224,7 +224,7 @@
>>   	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 @@
>>   	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: xfsprogs/quota/quota.h
>> ===================================================================
>> --- xfsprogs.orig/quota/quota.h	2013-03-22 14:22:09.000000000 -0500
>> +++ xfsprogs/quota/quota.h	2013-04-22 08:12:26.000000000 -0500
>> @@ -19,6 +19,7 @@
>>   #include <xfs/xqm.h>
>>   #include <xfs/path.h>
>>   #include <xfs/project.h>
>> +#include <stdbool.h>
>>
>>   /*
>>    * Different forms of XFS quota
>> @@ -80,4 +81,5 @@
>>   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 bool isdigits_only(const char *);
>>
>>
>>
>> _______________________________________________
>> xfs mailing list
>> xfs@oss.sgi.com
>> http://oss.sgi.com/mailman/listinfo/xfs
>>
>
>


_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

^ permalink raw reply	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-04-22 16:39 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-04-22 13:31 [V2] xfsprogs: xfs_quota allow user or group names beginning with digits rjohnston
2013-04-22 16:18 ` Chandra Seetharaman
2013-04-22 16:39   ` Rich Johnston

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox