xfs
[Top] [All Lists]

[PATCH] xfs_quota: allow create limit when user or group names beginning

To: dchinner@xxxxxxxxxx
Subject: [PATCH] xfs_quota: allow create limit when user or group names beginning with digits
From: Zorro Lang <zlang@xxxxxxxxxx>
Date: Sat, 2 Apr 2016 23:59:30 +0800
Cc: xfs@xxxxxxxxxxx, sandeen@xxxxxxxxxx, Zorro Lang <zlang@xxxxxxxxxx>
Delivered-to: xfs@xxxxxxxxxxx
A normal user or group name allow beginning with digits, but xfs_quota
can't create a limit for that user or group. The reason is 'strtoul'
function only translate digits at the beginning, it will ignore
letters after digits.

There's a commit fd537fc50eeade63bbd2a66105f39d04a011a7f5, it try to
fix "xfsprogs: xfs_quota allow user or group names beginning with
digits". But it doesn't effect 'limit' command, so a command likes:

  xfs_quota 'limit .... 12345678-user' xxxx

will try to create limit for username="12345678", not "12345678-user".

This patch will fix this problem, and a test case xfs/138 in xfstests
is used to reproduce this bug.

Signed-off-by: Zorro Lang <zlang@xxxxxxxxxx>
Reviewed-by: Eric Sandeen <sandeen@xxxxxxxxxx>
---

Hi Dave,

I just found there's a missed patch in my local xfsprogs repo, it has
been reviewed for a long:

http://oss.sgi.com/archives/xfs/2015-12/msg00134.html

And the reproducer about this bug has been merged into xfstests for
several months, but I don't know why we can't merge this patch. Would
you please check it?

Due to long time has passed, so I rewrite this patch and re-send it
again now. If anything wrong in this patch, please let me know:)

Thanks very much,
Zorro

 libxcmd/input.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libxcmd/input.c b/libxcmd/input.c
index c505ab3..5a7dce3 100644
--- a/libxcmd/input.c
+++ b/libxcmd/input.c
@@ -366,7 +366,7 @@ uid_from_string(
        char            *sp;
 
        uid_long = strtoul(user, &sp, 10);
-       if (sp != user) {
+       if (sp != user && *sp == '\0') {
                if ((uid_long == ULONG_MAX && errno == ERANGE)
                                || (uid_long > (uid_t)-1))
                        return -1;
@@ -387,7 +387,7 @@ gid_from_string(
        char            *sp;
 
        gid_long = strtoul(group, &sp, 10);
-       if (sp != group) {
+       if (sp != group && *sp == '\0') {
                if ((gid_long == ULONG_MAX && errno == ERANGE)
                                || (gid_long > (gid_t)-1))
                        return -1;
-- 
2.5.0

<Prev in Thread] Current Thread [Next in Thread>
  • [PATCH] xfs_quota: allow create limit when user or group names beginning with digits, Zorro Lang <=