From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754626AbbLKPOZ (ORCPT ); Fri, 11 Dec 2015 10:14:25 -0500 Received: from mx1.redhat.com ([209.132.183.28]:49583 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751043AbbLKPOY (ORCPT ); Fri, 11 Dec 2015 10:14:24 -0500 From: Andreas Gruenbacher To: Al Viro Cc: Andreas Gruenbacher , LKML , linux-fsdevel Subject: [PATCH] nfs: Fix listxattr regression (2) Date: Fri, 11 Dec 2015 16:14:19 +0100 Message-Id: <1449846859-19375-1-git-send-email-agruenba@redhat.com> References: <1449836146-5674-1-git-send-email-agruenba@redhat.com> <20151211125528.GJ20997@ZenIV.linux.org.uk> In-Reply-To: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Al, here is another fix for the same botched nfs commit. Could you please also merge / fold that? Sorry for the mess. Thanks, Andreas -- Fix another regression introduced in d77ae742: listxattr ended up always failing with -ERANGE on NFSv4.2 mounts with security label support. Signed-off-by: Andreas Gruenbacher --- fs/nfs/nfs4proc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index e9db118..c57d133 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -6296,8 +6296,8 @@ nfs4_listxattr_nfs4_label(struct inode *inode, char *list, size_t list_len) int len = 0; if (nfs_server_capable(inode, NFS_CAP_SECURITY_LABEL)) { - len = security_inode_listsecurity(inode, list, len); - if (len > list_len) + len = security_inode_listsecurity(inode, list, list_len); + if (list_len && len > list_len) return -ERANGE; } return len; -- 2.5.0