uid/gid fixes

from: https://github.com/cnt0/rt5390/commit/042fef4fd2282c4db941963cd0727919b85717a5 https://github.com/porjo/mt7601/commit/7a438c954affcb345f7deab4d15a26b36f89c328 https://github.com/porjo/mt7601/commit/de3ce8331956d1de2663794e3e512dc94fc9baae
likwidoxigen · Sep 21, 2015 · a1e9610 · a1e9610
1 parent 8de4eb1
commit a1e9610
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/include/os/rt_linux.h b/include/os/rt_linux.h
@@ -109,7 +109,7 @@
 
 #ifdef KTHREAD_SUPPORT
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,4)
-#error "This kerne version doesn't support kthread!!"
+#error "This kernel version doesn't support kthread!!"
 #endif
 #endif /* KTHREAD_SUPPORT */
 
@@ -277,8 +277,13 @@ typedef struct file* RTMP_OS_FD;
 
 typedef struct _OS_FS_INFO_
 {
-	int				fsuid;
-	int				fsgid;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,0)
+	uid_t				fsuid;
+	gid_t				fsgid;
+#else
+	kuid_t				fsuid;
+	kgid_t				fsgid;
+#endif
 	mm_segment_t	fs;
 } OS_FS_INFO;
 

diff --git a/os/linux/rt_linux.c b/os/linux/rt_linux.c
@@ -1103,9 +1103,13 @@ static inline void __RtmpOSFSInfoChange(OS_FS_INFO * pOSFSInfo, BOOLEAN bSet)
 		pOSFSInfo->fsuid = current->fsuid.val;
 		pOSFSInfo->fsgid = current->fsgid.val;
 		current->fsuid = current->fsgid.val = 0;
+#elif LINUX_VERSION_CODE < KERNEL_VERSION(3,12,0)
+		pOSFSInfo->fsuid = current_fsuid();
+		pOSFSInfo->fsgid = current_fsgid();
 #else
-		pOSFSInfo->fsuid = current_fsuid().val;
-		pOSFSInfo->fsgid = current_fsgid().val;
+		struct user_namespace *to = current_user_ns();
+		pOSFSInfo->fsuid = from_kuid_munged(to, current_fsuid());
+		pOSFSInfo->fsgid = from_kgid_munged(to, current_fsgid());
 #endif
 		pOSFSInfo->fs = get_fs();
 		set_fs(KERNEL_DS);