40 lines
1.1 KiB
Diff
40 lines
1.1 KiB
Diff
From 19f621ccbef745dedad641f44f535e3bcb00f30d Mon Sep 17 00:00:00 2001
|
|
From: Andrew Morton <akpm@linux-foundation.org>
|
|
Date: Sat, 25 Feb 2012 12:28:43 +1100
|
|
Subject: [PATCH 4/5] fs-hardlink-creation-restrictions-fix
|
|
|
|
uninline may_linkat() and audit_log_link_denied().
|
|
|
|
Cc: Kees Cook <keescook@chromium.org>
|
|
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
|
|
---
|
|
fs/namei.c | 5 ++---
|
|
1 files changed, 2 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/fs/namei.c b/fs/namei.c
|
|
index 7be190c..fe13533 100644
|
|
--- a/fs/namei.c
|
|
+++ b/fs/namei.c
|
|
@@ -629,8 +629,7 @@ int sysctl_protected_symlinks __read_mostly =
|
|
int sysctl_protected_hardlinks __read_mostly =
|
|
CONFIG_PROTECTED_HARDLINKS_SYSCTL;
|
|
|
|
-static inline void
|
|
-audit_log_link_denied(const char *operation, struct path *link)
|
|
+static void audit_log_link_denied(const char *operation, struct path *link)
|
|
{
|
|
struct audit_buffer *ab;
|
|
|
|
@@ -709,7 +708,7 @@ static inline int may_follow_link(struct path *link)
|
|
*
|
|
* Returns 0 if successful, -ve on error.
|
|
*/
|
|
-static inline int may_linkat(struct path *link)
|
|
+static int may_linkat(struct path *link)
|
|
{
|
|
int error = 0;
|
|
const struct cred *cred;
|
|
--
|
|
1.7.9.1
|
|
|