From: Kees Cook <keescook@chromium.org>
Date: Mon, 8 May 2017 21:49:27 +0000 (-0700)
Subject: ocfs2: Use ERR_CAST() to avoid cross-structure cast
X-Git-Tag: v6.6-pxa1908~16579^2~4
X-Git-Url: https://git.dujemihanovic.xyz/?a=commitdiff_plain;h=7585d12f6555fdf4faaefec34ac58b28555b27d0;p=linux.git

ocfs2: Use ERR_CAST() to avoid cross-structure cast

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>
---

diff --git a/fs/ocfs2/export.c b/fs/ocfs2/export.c
index 827fc9809bc2..9f88188060db 100644
--- a/fs/ocfs2/export.c
+++ b/fs/ocfs2/export.c
@@ -119,7 +119,7 @@ check_err:
 
 	if (IS_ERR(inode)) {
 		mlog_errno(PTR_ERR(inode));
-		result = (void *)inode;
+		result = ERR_CAST(inode);
 		goto bail;
 	}