aboutsummaryrefslogtreecommitdiffstats
path: root/main/ipfw-grsec/ipfw-strict-uidgid.patch
diff options
context:
space:
mode:
Diffstat (limited to 'main/ipfw-grsec/ipfw-strict-uidgid.patch')
-rw-r--r--main/ipfw-grsec/ipfw-strict-uidgid.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/main/ipfw-grsec/ipfw-strict-uidgid.patch b/main/ipfw-grsec/ipfw-strict-uidgid.patch
index cf4376b956..ca4006aebd 100644
--- a/main/ipfw-grsec/ipfw-strict-uidgid.patch
+++ b/main/ipfw-grsec/ipfw-strict-uidgid.patch
@@ -8,8 +8,8 @@
+#ifdef CONFIG_UIDGID_STRICT_TYPE_CHECKS
+#include <linux/uidgid.h>
+
-+#define KUID_TO_SUID(x) (__kuid_val(x))
-+#define KGID_TO_SGID(x) (__kgid_val(x))
++#define KUID_TO_SUID(x) (x.val)
++#define KGID_TO_SGID(x) (x.val)
+#define SUID_TO_KUID(x) (KUIDT_INIT(x))
+#define SGID_TO_KGID(x) (KGIDT_INIT(x))
+
@@ -33,8 +33,8 @@
if (sk->sk_socket && sk->sk_socket->file) {
- u->uid = sk->sk_socket->file->_CURR_UID;
- u->gid = sk->sk_socket->file->_CURR_GID;
-+ u->uid = KUID_TO_SUID(sk->sk_socket->file->_CURR_UID);
-+ u->gid = KGID_TO_SGID(sk->sk_socket->file->_CURR_GID);
++ u->uid = KUID_TO_SUID(sk->sk_socket->file->_CURR_UID.val);
++ u->gid = KGID_TO_SGID(sk->sk_socket->file->_CURR_GID.val);
}
read_unlock_bh(&sk->sk_callback_lock);
} else {