Skip to content

Commit

Permalink
ocfs2: Use ERR_CAST() to avoid cross-structure cast
Browse files Browse the repository at this point in the history
When trying to propagate an error result, the error return path attempts
to retain the error, but does this with an open cast across very different
types, which the upcoming structure layout randomization plugin flags as
being potentially dangerous in the face of randomization. This is a false
positive, but what this code actually wants to do is use ERR_CAST() to
retain the error value.

Cc: Mark Fasheh <mfasheh@versity.com>
Cc: Joel Becker <jlbec@evilplan.org>
Signed-off-by: Kees Cook <keescook@chromium.org>
  • Loading branch information
Kees Cook committed May 28, 2017
1 parent fee2aa7 commit 7585d12
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion fs/ocfs2/export.c
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ static struct dentry *ocfs2_get_dentry(struct super_block *sb,

if (IS_ERR(inode)) {
mlog_errno(PTR_ERR(inode));
result = (void *)inode;
result = ERR_CAST(inode);
goto bail;
}

Expand Down

0 comments on commit 7585d12

Please sign in to comment.