knfsd: fix broken length check in nfs4idmap.c

Obviously at some point we thought "error" represented the length when positive. This appears to be a long-standing typo. Thanks to Prasad Potluri <[email protected]> for finding the problem and proposing an earlier version of this patch. Cc: Steve French <[email protected]> Cc: Prasad V Potluri <[email protected]> Signed-off-by: J. Bruce Fields <[email protected]>
kishon · Feb 1, 2008 · d4395e0 · d4395e0
1 parent aefa89d
commit d4395e0
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/fs/nfsd/nfs4idmap.c b/fs/nfsd/nfs4idmap.c
@@ -255,13 +255,10 @@ idtoname_parse(struct cache_detail *cd, char *buf, int buflen)
 		goto out;
 	if (len == 0)
 		set_bit(CACHE_NEGATIVE, &ent.h.flags);
-	else {
-		if (error >= IDMAP_NAMESZ) {
-			error = -EINVAL;
-			goto out;
-		}
+	else if (len >= IDMAP_NAMESZ)
+		goto out;
+	else
 		memcpy(ent.name, buf1, sizeof(ent.name));
-	}
 	error = -ENOMEM;
 	res = idtoname_update(&ent, res);
 	if (res == NULL)