Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756649AbZLULyP (ORCPT ); Mon, 21 Dec 2009 06:54:15 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755324AbZLULyN (ORCPT ); Mon, 21 Dec 2009 06:54:13 -0500 Received: from mail-pz0-f171.google.com ([209.85.222.171]:36504 "EHLO mail-pz0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753753AbZLULyM (ORCPT ); Mon, 21 Dec 2009 06:54:12 -0500 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:reply-to:user-agent:mime-version:to:subject :content-type:content-transfer-encoding; b=WMHpP56BLmpOQz3qwO3AFLL6atf24BW05ybeLq7DdZ2P68mwO3fqsyH5WuULp3IQ95 bXyv3/iPmImd/chRbz1GP3sFcQeWD9suL4dbHn5g0iqThjn/W16dwrNmPwSm7tazUP4H sleFTebxtoXUfZqmBmuZCQD8mBE5DeHTQlbN0= Message-ID: <4B2F629F.1000401@gmail.com> Date: Mon, 21 Dec 2009 19:57:19 +0800 From: Liuwenyi Reply-To: qingshenlwy@gmail.com User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; zh-CN; rv:1.9.1.5) Gecko/20091204 Thunderbird/3.0 MIME-Version: 1.0 To: tytso@mit.edu, adilger@sun.com, viro@zeniv.linux.org.uk, jmorris@namei.org, joel.becker@oracle.com, serue@us.ibm.com, hch@lst.de, linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org, onlyflyer@gmail.com, strongzgy@gmail.com Subject: [PATCHv2 05/12]posix_acl: Add the check items Content-Type: text/plain; charset=GB2312 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1250 Lines: 50 move the ACL validation check in to fs/posix_acl.c. Including nullpointer check and PTR_ERR check. --- Signed-off-by: Liuwenyi Cc: "Theodore Ts'o" Cc: Andreas Dilger Cc: Al Viro Cc: James Morris Cc: Joel Becker Cc: Serge Hallyn Cc: Christoph Hellwig Cc: linux-ext4@vger.kernel.org Cc: linux-kernel@vger.kernel.org --- diff --git a/fs/ext4/acl.c b/fs/ext4/acl.c index 8a2a29d..aeb41ca 100644 --- a/fs/ext4/acl.c +++ b/fs/ext4/acl.c @@ -430,13 +430,11 @@ ext4_xattr_set_acl(struct dentry *dentry, const char *name, const void *value, if (value) { acl = posix_acl_from_xattr(value, size); - if (IS_ERR(acl)) - return PTR_ERR(acl); - else if (acl) { - error = posix_acl_valid(acl); - if (error) - goto release_and_out; - } + + error = posix_acl_valid(acl); + if (error) + goto release_and_out; + } else acl = NULL; -- Best Regards, Liuwenyi -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/