From: Dan Carpenter <dan.carpenter@oracle.com> To: Alexander Viro <viro@zeniv.linux.org.uk> Cc: linux-fsdevel@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: [patch] posix_acl: cleanup posix_acl_create() Date: Sat, 24 Jan 2015 22:31:24 +0300 [thread overview] Message-ID: <20150124193124.GA18322@mwanda> (raw) If posix_acl_create() returns an error code then "*acl" and "*default_acl" can be uninitialized or point to freed memory. This causes problems in some of the callers where it is expected that they are NULL on error. For example, ocfs2_reflink() has a bug. fs/ocfs2/refcounttree.c:4329 ocfs2_reflink() error: potentially using uninitialized 'default_acl'. I have re-written this function and re-arranged things so that they are set to NULL at the start and then only set to a valid pointer at the end of the function. Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> diff --git a/fs/posix_acl.c b/fs/posix_acl.c index 0855f77..66d2c13 100644 --- a/fs/posix_acl.c +++ b/fs/posix_acl.c @@ -546,50 +546,43 @@ int posix_acl_create(struct inode *dir, umode_t *mode, struct posix_acl **default_acl, struct posix_acl **acl) { - struct posix_acl *p; + struct posix_acl *p, *clone; int ret; + *acl = NULL; + *default_acl = NULL; + if (S_ISLNK(*mode) || !IS_POSIXACL(dir)) - goto no_acl; + return 0; p = get_acl(dir, ACL_TYPE_DEFAULT); - if (IS_ERR(p)) { - if (p == ERR_PTR(-EOPNOTSUPP)) - goto apply_umask; - return PTR_ERR(p); + if (!p || p == ERR_PTR(-EOPNOTSUPP)) { + *mode &= ~current_umask(); + return 0; } + if (IS_ERR(p)) + return PTR_ERR(p); - if (!p) - goto apply_umask; - - *acl = posix_acl_clone(p, GFP_NOFS); - if (!*acl) + clone = posix_acl_clone(p, GFP_NOFS); + if (!clone) return -ENOMEM; - ret = posix_acl_create_masq(*acl, mode); + ret = posix_acl_create_masq(clone, mode); if (ret < 0) { - posix_acl_release(*acl); + posix_acl_release(clone); return -ENOMEM; } - if (ret == 0) { - posix_acl_release(*acl); - *acl = NULL; - } + if (ret == 0) + posix_acl_release(clone); + else + *acl = clone; - if (!S_ISDIR(*mode)) { + if (!S_ISDIR(*mode)) posix_acl_release(p); - *default_acl = NULL; - } else { + else *default_acl = p; - } - return 0; -apply_umask: - *mode &= ~current_umask(); -no_acl: - *default_acl = NULL; - *acl = NULL; return 0; } EXPORT_SYMBOL_GPL(posix_acl_create);
WARNING: multiple messages have this Message-ID (diff)
From: Dan Carpenter <dan.carpenter@oracle.com> To: Alexander Viro <viro@zeniv.linux.org.uk> Cc: linux-fsdevel@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: [patch] posix_acl: cleanup posix_acl_create() Date: Sat, 24 Jan 2015 19:31:24 +0000 [thread overview] Message-ID: <20150124193124.GA18322@mwanda> (raw) If posix_acl_create() returns an error code then "*acl" and "*default_acl" can be uninitialized or point to freed memory. This causes problems in some of the callers where it is expected that they are NULL on error. For example, ocfs2_reflink() has a bug. fs/ocfs2/refcounttree.c:4329 ocfs2_reflink() error: potentially using uninitialized 'default_acl'. I have re-written this function and re-arranged things so that they are set to NULL at the start and then only set to a valid pointer at the end of the function. Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> diff --git a/fs/posix_acl.c b/fs/posix_acl.c index 0855f77..66d2c13 100644 --- a/fs/posix_acl.c +++ b/fs/posix_acl.c @@ -546,50 +546,43 @@ int posix_acl_create(struct inode *dir, umode_t *mode, struct posix_acl **default_acl, struct posix_acl **acl) { - struct posix_acl *p; + struct posix_acl *p, *clone; int ret; + *acl = NULL; + *default_acl = NULL; + if (S_ISLNK(*mode) || !IS_POSIXACL(dir)) - goto no_acl; + return 0; p = get_acl(dir, ACL_TYPE_DEFAULT); - if (IS_ERR(p)) { - if (p = ERR_PTR(-EOPNOTSUPP)) - goto apply_umask; - return PTR_ERR(p); + if (!p || p = ERR_PTR(-EOPNOTSUPP)) { + *mode &= ~current_umask(); + return 0; } + if (IS_ERR(p)) + return PTR_ERR(p); - if (!p) - goto apply_umask; - - *acl = posix_acl_clone(p, GFP_NOFS); - if (!*acl) + clone = posix_acl_clone(p, GFP_NOFS); + if (!clone) return -ENOMEM; - ret = posix_acl_create_masq(*acl, mode); + ret = posix_acl_create_masq(clone, mode); if (ret < 0) { - posix_acl_release(*acl); + posix_acl_release(clone); return -ENOMEM; } - if (ret = 0) { - posix_acl_release(*acl); - *acl = NULL; - } + if (ret = 0) + posix_acl_release(clone); + else + *acl = clone; - if (!S_ISDIR(*mode)) { + if (!S_ISDIR(*mode)) posix_acl_release(p); - *default_acl = NULL; - } else { + else *default_acl = p; - } - return 0; -apply_umask: - *mode &= ~current_umask(); -no_acl: - *default_acl = NULL; - *acl = NULL; return 0; } EXPORT_SYMBOL_GPL(posix_acl_create);
next reply other threads:[~2015-01-24 19:31 UTC|newest] Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-01-24 19:31 Dan Carpenter [this message] 2015-01-24 19:31 ` [patch] posix_acl: cleanup posix_acl_create() Dan Carpenter 2015-01-27 4:52 ` Omar Sandoval 2015-01-27 4:52 ` Omar Sandoval 2015-01-27 6:45 ` Dan Carpenter 2015-01-27 6:45 ` Dan Carpenter 2015-03-05 17:46 ` [patch 1/2] ocfs2: dereferencing freed pointers in ocfs2_reflink() Dan Carpenter 2015-03-05 17:46 ` [Ocfs2-devel] " Dan Carpenter 2015-03-05 17:46 ` Dan Carpenter 2015-03-09 15:02 ` Mark Fasheh 2015-03-09 15:02 ` [Ocfs2-devel] " Mark Fasheh 2015-03-09 15:02 ` Mark Fasheh 2015-03-05 17:47 ` [patch 2/2 v2] posix_acl: make posix_acl_create() safer and cleaner Dan Carpenter 2015-03-05 17:47 ` [Ocfs2-devel] " Dan Carpenter 2015-03-05 17:47 ` Dan Carpenter
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20150124193124.GA18322@mwanda \ --to=dan.carpenter@oracle.com \ --cc=kernel-janitors@vger.kernel.org \ --cc=linux-fsdevel@vger.kernel.org \ --cc=viro@zeniv.linux.org.uk \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.