Skip to content

Commit 38ebf37

Browse files
elohim-etzkardebayan
authored andcommitted
selinux: Fix compilation errors after selinux_is_enabled() removal
Signed-off-by: Naveen <133593113+elohim-etz@users.noreply.github.com>
1 parent 92cbc57 commit 38ebf37

4 files changed

Lines changed: 5 additions & 12 deletions

File tree

arch/arm64/kernel/rootguard/oplus_hook_syscall.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
#define KERNEL_ADDR_LIMIT 0x0000008000000000
3030
#include <asm/uaccess.h>
3131
#include <linux/cred.h>
32-
#include <linux/selinux.h>
3332
#include "oplus_root.h"
3433
#endif /* CONFIG_OPLUS_SECURE_GUARD */
3534

arch/arm64/kernel/rootguard/oplus_root_check.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
#include <linux/types.h>
1717
#include <linux/version.h>
1818
#include <linux/vmalloc.h>
19-
#include <linux/selinux.h>
2019
#ifdef VENDOR_EDIT
2120

2221
#if LINUX_VERSION_CODE < KERNEL_VERSION(4,19,0)
@@ -62,7 +61,7 @@ void oplus_root_check_succ(uid_t uid, uid_t euid, uid_t fsuid, uid_t callnum)
6261
dcs_event->payload_length = snprintf(dcs_event_payload,256,
6362
"%d$$old_euid@@%d$$old_fsuid@@%d$$sys_call_number@@%d$$addr_limit@@%lx$$curr_uid@@%d$$curr_euid@@%d$$curr_fsuid@@%d$$curr_name@@%s$$ppid@@%d$$ppidname@@%s$$enforce@@%d\n",
6463
uid,euid,fsuid,callnum,
65-
get_fs(),current_uid().val,current_euid().val,current_fsuid().val,get_task_comm(comm, current), ppid, nameofppid,selinux_is_enabled());
64+
get_fs(),current_uid().val,current_euid().val,current_fsuid().val,get_task_comm(comm, current), ppid, nameofppid, 0);
6665
printk(KERN_INFO "oplus_root_check_succ,payload:%s\n",dcs_event_payload);
6766
memcpy(dcs_event->payload, dcs_event_payload, strlen(dcs_event_payload));
6867

drivers/staging/lustre/lustre/llite/xattr.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
#include <linux/sched.h>
3535
#include <linux/mm.h>
3636
#include <linux/xattr.h>
37-
#include <linux/selinux.h>
3837

3938
#define DEBUG_SUBSYSTEM S_LLITE
4039

@@ -126,7 +125,7 @@ ll_xattr_set_common(const struct xattr_handler *handler,
126125
return 0;
127126

128127
/* LU-549: Disable security.selinux when selinux is disabled */
129-
if (handler->flags == XATTR_SECURITY_T && !selinux_is_enabled() &&
128+
if (handler->flags == XATTR_SECURITY_T &&
130129
strcmp(name, "selinux") == 0)
131130
return -EOPNOTSUPP;
132131

@@ -388,7 +387,7 @@ static int ll_xattr_get_common(const struct xattr_handler *handler,
388387
return -ENODATA;
389388

390389
/* LU-549: Disable security.selinux when selinux is disabled */
391-
if (handler->flags == XATTR_SECURITY_T && !selinux_is_enabled() &&
390+
if (handler->flags == XATTR_SECURITY_T &&
392391
!strcmp(name, "selinux"))
393392
return -EOPNOTSUPP;
394393

drivers/staging/lustre/lustre/llite/xattr_security.c

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131

3232
#include <linux/types.h>
3333
#include <linux/security.h>
34-
#include <linux/selinux.h>
3534
#include <linux/xattr.h>
3635
#include "llite_internal.h"
3736

@@ -87,9 +86,6 @@ ll_initxattrs(struct inode *inode, const struct xattr *xattr_array,
8786
int
8887
ll_init_security(struct dentry *dentry, struct inode *inode, struct inode *dir)
8988
{
90-
if (!selinux_is_enabled())
91-
return 0;
92-
93-
return security_inode_init_security(inode, dir, NULL,
94-
&ll_initxattrs, dentry);
89+
return security_inode_init_security(inode, dir, NULL,
90+
&ll_initxattrs, dentry);
9591
}

0 commit comments

Comments
 (0)