malhuda/msm-4.14
1
0
Fork 0
mirror of https://github.com/rd-stuffs/msm-4.14.git synced 2025-02-20 11:45:48 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

BACKPORT: FROMGIT: [PATCH] msg/security: Pass kern_ipc_perm not msg_queue into the

Browse Source 
msg_queue security hooks

All of the implementations of security hooks that take msg_queue only
access q_perm the struct kern_ipc_perm member.  This means the
dependencies of the msg_queue security hooks can be simplified by
passing the kern_ipc_perm member of msg_queue.

Making this change will allow struct msg_queue to become private to
ipc/msg.c.

Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: Jebaitedneko <Jebaitedneko@gmail.com>
This commit is contained in:
Eric W. Biederman 2021-06-29 15:50:45 +05:30 committed by Adithya R
parent ffb2b076f1
commit df7a0c6181
6 changed files with 62 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/linux/lsm_hooks.h
View File

@ -1575,13 +1575,13 @@ union security_list_options {
int (*msg_msg_alloc_security)(struct msg_msg *msg); int (*msg_msg_alloc_security)(struct msg_msg *msg);
void (*msg_msg_free_security)(struct msg_msg *msg); void (*msg_msg_free_security)(struct msg_msg *msg);
int (*msg_queue_alloc_security)(struct msg_queue *msq); int (*msg_queue_alloc_security)(struct kern_ipc_perm *msq);
void (*msg_queue_free_security)(struct msg_queue *msq); void (*msg_queue_free_security)(struct kern_ipc_perm *msq);
int (*msg_queue_associate)(struct msg_queue *msq, int msqflg); int (*msg_queue_associate)(struct kern_ipc_perm *msq, int msqflg);
int (*msg_queue_msgctl)(struct msg_queue *msq, int cmd); int (*msg_queue_msgctl)(struct kern_ipc_perm *msq, int cmd);
int (*msg_queue_msgsnd)(struct msg_queue *msq, struct msg_msg *msg, int (*msg_queue_msgsnd)(struct kern_ipc_perm *msq, struct msg_msg *msg,
int msqflg); int msqflg);
int (*msg_queue_msgrcv)(struct msg_queue *msq, struct msg_msg *msg, int (*msg_queue_msgrcv)(struct kern_ipc_perm *msq, struct msg_msg *msg,
struct task_struct *target, long type, struct task_struct *target, long type,
int mode); int mode);

25
include/linux/security.h
View File

@ -50,7 +50,6 @@ struct iattr;
struct fown_struct; struct fown_struct;
struct file_operations; struct file_operations;
struct msg_msg; struct msg_msg;
struct msg_queue;
struct xattr; struct xattr;
struct xfrm_sec_ctx; struct xfrm_sec_ctx;
struct mm_struct; struct mm_struct;
@ -353,13 +352,13 @@ int security_ipc_permission(struct kern_ipc_perm *ipcp, short flag);
void security_ipc_getsecid(struct kern_ipc_perm *ipcp, u32 *secid); void security_ipc_getsecid(struct kern_ipc_perm *ipcp, u32 *secid);
int security_msg_msg_alloc(struct msg_msg *msg); int security_msg_msg_alloc(struct msg_msg *msg);
void security_msg_msg_free(struct msg_msg *msg); void security_msg_msg_free(struct msg_msg *msg);
int security_msg_queue_alloc(struct msg_queue *msq); int security_msg_queue_alloc(struct kern_ipc_perm *msq);
void security_msg_queue_free(struct msg_queue *msq); void security_msg_queue_free(struct kern_ipc_perm *msq);
int security_msg_queue_associate(struct msg_queue *msq, int msqflg); int security_msg_queue_associate(struct kern_ipc_perm *msq, int msqflg);
int security_msg_queue_msgctl(struct msg_queue *msq, int cmd); int security_msg_queue_msgctl(struct kern_ipc_perm *msq, int cmd);
int security_msg_queue_msgsnd(struct msg_queue *msq, int security_msg_queue_msgsnd(struct kern_ipc_perm *msq,
struct msg_msg *msg, int msqflg); struct msg_msg *msg, int msqflg);
int security_msg_queue_msgrcv(struct msg_queue *msq, struct msg_msg *msg, int security_msg_queue_msgrcv(struct kern_ipc_perm *msq, struct msg_msg *msg,
struct task_struct *target, long type, int mode); struct task_struct *target, long type, int mode);
int security_shm_alloc(struct kern_ipc_perm *shp); int security_shm_alloc(struct kern_ipc_perm *shp);
void security_shm_free(struct kern_ipc_perm *shp); void security_shm_free(struct kern_ipc_perm *shp);
@ -1043,32 +1042,32 @@ static inline int security_msg_msg_alloc(struct msg_msg *msg)
static inline void security_msg_msg_free(struct msg_msg *msg) static inline void security_msg_msg_free(struct msg_msg *msg)
{ } { }
static inline int security_msg_queue_alloc(struct msg_queue *msq) static inline int security_msg_queue_alloc(struct kern_ipc_perm *msq)
{ {
return 0; return 0;
} }
static inline void security_msg_queue_free(struct msg_queue *msq) static inline void security_msg_queue_free(struct kern_ipc_perm *msq)
{ } { }
static inline int security_msg_queue_associate(struct msg_queue *msq, static inline int security_msg_queue_associate(struct kern_ipc_perm *msq,
int msqflg) int msqflg)
{ {
return 0; return 0;
} }
static inline int security_msg_queue_msgctl(struct msg_queue *msq, int cmd) static inline int security_msg_queue_msgctl(struct kern_ipc_perm *msq, int cmd)
{ {
return 0; return 0;
} }
static inline int security_msg_queue_msgsnd(struct msg_queue *msq, static inline int security_msg_queue_msgsnd(struct kern_ipc_perm *msq,
struct msg_msg *msg, int msqflg) struct msg_msg *msg, int msqflg)
{ {
return 0; return 0;
} }
static inline int security_msg_queue_msgrcv(struct msg_queue *msq, static inline int security_msg_queue_msgrcv(struct kern_ipc_perm *msq,
struct msg_msg *msg, struct msg_msg *msg,
struct task_struct *target, struct task_struct *target,
long type, int mode) long type, int mode)

18
ipc/msg.c
View File

@ -101,7 +101,7 @@ static void msg_rcu_free(struct rcu_head *head)
struct kern_ipc_perm *p = container_of(head, struct kern_ipc_perm, rcu); struct kern_ipc_perm *p = container_of(head, struct kern_ipc_perm, rcu);
struct msg_queue *msq = container_of(p, struct msg_queue, q_perm); struct msg_queue *msq = container_of(p, struct msg_queue, q_perm);
security_msg_queue_free(msq); security_msg_queue_free(&msq->q_perm);
kvfree(msq); kvfree(msq);
} }
@ -127,7 +127,7 @@ static int newque(struct ipc_namespace *ns, struct ipc_params *params)
msq->q_perm.key = key; msq->q_perm.key = key;
msq->q_perm.security = NULL; msq->q_perm.security = NULL;
retval = security_msg_queue_alloc(msq); retval = security_msg_queue_alloc(&msq->q_perm);
if (retval) { if (retval) {
kvfree(msq); kvfree(msq);
return retval; return retval;
@ -258,9 +258,7 @@ static void freeque(struct ipc_namespace *ns, struct kern_ipc_perm *ipcp)
*/ */
static inline int msg_security(struct kern_ipc_perm *ipcp, int msgflg) static inline int msg_security(struct kern_ipc_perm *ipcp, int msgflg)
{ {
struct msg_queue *msq = container_of(ipcp, struct msg_queue, q_perm); return security_msg_queue_associate(ipcp, msgflg);
return security_msg_queue_associate(msq, msgflg);
} }
SYSCALL_DEFINE2(msgget, key_t, key, int, msgflg) SYSCALL_DEFINE2(msgget, key_t, key, int, msgflg)
@ -380,7 +378,7 @@ static int msgctl_down(struct ipc_namespace *ns, int msqid, int cmd,
msq = container_of(ipcp, struct msg_queue, q_perm); msq = container_of(ipcp, struct msg_queue, q_perm);
err = security_msg_queue_msgctl(msq, cmd); err = security_msg_queue_msgctl(&msq->q_perm, cmd);
if (err) if (err)
goto out_unlock1; goto out_unlock1;
@ -503,7 +501,7 @@ static int msgctl_stat(struct ipc_namespace *ns, int msqid,
if (ipcperms(ns, &msq->q_perm, S_IRUGO)) if (ipcperms(ns, &msq->q_perm, S_IRUGO))
goto out_unlock; goto out_unlock;
err = security_msg_queue_msgctl(msq, cmd); err = security_msg_queue_msgctl(&msq->q_perm, cmd);
if (err) if (err)
goto out_unlock; goto out_unlock;
@ -710,7 +708,7 @@ static inline int pipelined_send(struct msg_queue *msq, struct msg_msg *msg,
list_for_each_entry_safe(msr, t, &msq->q_receivers, r_list) { list_for_each_entry_safe(msr, t, &msq->q_receivers, r_list) {
if (testmsg(msg, msr->r_msgtype, msr->r_mode) && if (testmsg(msg, msr->r_msgtype, msr->r_mode) &&
!security_msg_queue_msgrcv(msq, msg, msr->r_tsk, !security_msg_queue_msgrcv(&msq->q_perm, msg, msr->r_tsk,
msr->r_msgtype, msr->r_mode)) { msr->r_msgtype, msr->r_mode)) {
list_del(&msr->r_list); list_del(&msr->r_list);
@ -776,7 +774,7 @@ static long do_msgsnd(int msqid, long mtype, void __user *mtext,
goto out_unlock0; goto out_unlock0;
} }
err = security_msg_queue_msgsnd(msq, msg, msgflg); err = security_msg_queue_msgsnd(&msq->q_perm, msg, msgflg);
if (err) if (err)
goto out_unlock0; goto out_unlock0;
@ -952,7 +950,7 @@ static struct msg_msg *find_msg(struct msg_queue *msq, long *msgtyp, int mode)
list_for_each_entry(msg, &msq->q_messages, m_list) { list_for_each_entry(msg, &msq->q_messages, m_list) {
if (testmsg(msg, *msgtyp, mode) && if (testmsg(msg, *msgtyp, mode) &&
!security_msg_queue_msgrcv(msq, msg, current, !security_msg_queue_msgrcv(&msq->q_perm, msg, current,
*msgtyp, mode)) { *msgtyp, mode)) {
if (mode == SEARCH_LESSEQUAL && msg->m_type != 1) { if (mode == SEARCH_LESSEQUAL && msg->m_type != 1) {
*msgtyp = msg->m_type - 1; *msgtyp = msg->m_type - 1;

12
security/security.c
View File

@ -1173,33 +1173,33 @@ void security_msg_msg_free(struct msg_msg *msg)
call_void_hook(msg_msg_free_security, msg); call_void_hook(msg_msg_free_security, msg);
} }
int security_msg_queue_alloc(struct msg_queue *msq) int security_msg_queue_alloc(struct kern_ipc_perm *msq)
{ {
return call_int_hook(msg_queue_alloc_security, 0, msq); return call_int_hook(msg_queue_alloc_security, 0, msq);
} }
void security_msg_queue_free(struct msg_queue *msq) void security_msg_queue_free(struct kern_ipc_perm *msq)
{ {
call_void_hook(msg_queue_free_security, msq); call_void_hook(msg_queue_free_security, msq);
} }
int security_msg_queue_associate(struct msg_queue *msq, int msqflg) int security_msg_queue_associate(struct kern_ipc_perm *msq, int msqflg)
{ {
return call_int_hook(msg_queue_associate, 0, msq, msqflg); return call_int_hook(msg_queue_associate, 0, msq, msqflg);
} }
int security_msg_queue_msgctl(struct msg_queue *msq, int cmd) int security_msg_queue_msgctl(struct kern_ipc_perm *msq, int cmd)
{ {
return call_int_hook(msg_queue_msgctl, 0, msq, cmd); return call_int_hook(msg_queue_msgctl, 0, msq, cmd);
} }
int security_msg_queue_msgsnd(struct msg_queue *msq, int security_msg_queue_msgsnd(struct kern_ipc_perm *msq,
struct msg_msg *msg, int msqflg) struct msg_msg *msg, int msqflg)
{ {
return call_int_hook(msg_queue_msgsnd, 0, msq, msg, msqflg); return call_int_hook(msg_queue_msgsnd, 0, msq, msg, msqflg);
} }
int security_msg_queue_msgrcv(struct msg_queue *msq, struct msg_msg *msg, int security_msg_queue_msgrcv(struct kern_ipc_perm *msq, struct msg_msg *msg,
struct task_struct *target, long type, int mode) struct task_struct *target, long type, int mode)
{ {
return call_int_hook(msg_queue_msgrcv, 0, msq, msg, target, type, mode); return call_int_hook(msg_queue_msgrcv, 0, msq, msg, target, type, mode);

36
security/selinux/hooks.c
View File

@ -5731,54 +5731,54 @@ static void selinux_msg_msg_free_security(struct msg_msg *msg)
} }
/* message queue security operations */ /* message queue security operations */
static int selinux_msg_queue_alloc_security(struct msg_queue *msq) static int selinux_msg_queue_alloc_security(struct kern_ipc_perm *msq)
{ {
struct ipc_security_struct *isec; struct ipc_security_struct *isec;
struct common_audit_data ad; struct common_audit_data ad;
u32 sid = current_sid(); u32 sid = current_sid();
int rc; int rc;
rc = ipc_alloc_security(&msq->q_perm, SECCLASS_MSGQ); rc = ipc_alloc_security(msq, SECCLASS_MSGQ);
if (rc) if (rc)
return rc; return rc;
isec = msq->q_perm.security; isec = msq->security;
ad.type = LSM_AUDIT_DATA_IPC; ad.type = LSM_AUDIT_DATA_IPC;
ad.u.ipc_id = msq->q_perm.key; ad.u.ipc_id = msq->key;
rc = avc_has_perm(&selinux_state, rc = avc_has_perm(&selinux_state,
sid, isec->sid, SECCLASS_MSGQ, sid, isec->sid, SECCLASS_MSGQ,
MSGQ__CREATE, &ad); MSGQ__CREATE, &ad);
if (rc) { if (rc) {
ipc_free_security(&msq->q_perm); ipc_free_security(msq);
return rc; return rc;
} }
return 0; return 0;
} }
static void selinux_msg_queue_free_security(struct msg_queue *msq) static void selinux_msg_queue_free_security(struct kern_ipc_perm *msq)
{ {
ipc_free_security(&msq->q_perm); ipc_free_security(msq);
} }
static int selinux_msg_queue_associate(struct msg_queue *msq, int msqflg) static int selinux_msg_queue_associate(struct kern_ipc_perm *msq, int msqflg)
{ {
struct ipc_security_struct *isec; struct ipc_security_struct *isec;
struct common_audit_data ad; struct common_audit_data ad;
u32 sid = current_sid(); u32 sid = current_sid();
isec = msq->q_perm.security; isec = msq->security;
ad.type = LSM_AUDIT_DATA_IPC; ad.type = LSM_AUDIT_DATA_IPC;
ad.u.ipc_id = msq->q_perm.key; ad.u.ipc_id = msq->key;
return avc_has_perm(&selinux_state, return avc_has_perm(&selinux_state,
sid, isec->sid, SECCLASS_MSGQ, sid, isec->sid, SECCLASS_MSGQ,
MSGQ__ASSOCIATE, &ad); MSGQ__ASSOCIATE, &ad);
} }
static int selinux_msg_queue_msgctl(struct msg_queue *msq, int cmd) static int selinux_msg_queue_msgctl(struct kern_ipc_perm *msq, int cmd)
{ {
int err; int err;
int perms; int perms;
@ -5804,11 +5804,11 @@ static int selinux_msg_queue_msgctl(struct msg_queue *msq, int cmd)
return 0; return 0;
} }
err = ipc_has_perm(&msq->q_perm, perms); err = ipc_has_perm(msq, perms);
return err; return err;
} }
static int selinux_msg_queue_msgsnd(struct msg_queue *msq, struct msg_msg *msg, int msqflg) static int selinux_msg_queue_msgsnd(struct kern_ipc_perm *msq, struct msg_msg *msg, int msqflg)
{ {
struct ipc_security_struct *isec; struct ipc_security_struct *isec;
struct msg_security_struct *msec; struct msg_security_struct *msec;
@ -5816,7 +5816,7 @@ static int selinux_msg_queue_msgsnd(struct msg_queue *msq, struct msg_msg *msg,
u32 sid = current_sid(); u32 sid = current_sid();
int rc; int rc;
isec = msq->q_perm.security; isec = msq->security;
msec = msg->security; msec = msg->security;
/* /*
@ -5834,7 +5834,7 @@ static int selinux_msg_queue_msgsnd(struct msg_queue *msq, struct msg_msg *msg,
} }
ad.type = LSM_AUDIT_DATA_IPC; ad.type = LSM_AUDIT_DATA_IPC;
ad.u.ipc_id = msq->q_perm.key; ad.u.ipc_id = msq->key;
/* Can this process write to the queue? */ /* Can this process write to the queue? */
rc = avc_has_perm(&selinux_state, rc = avc_has_perm(&selinux_state,
@ -5854,7 +5854,7 @@ static int selinux_msg_queue_msgsnd(struct msg_queue *msq, struct msg_msg *msg,
return rc; return rc;
} }
static int selinux_msg_queue_msgrcv(struct msg_queue *msq, struct msg_msg *msg, static int selinux_msg_queue_msgrcv(struct kern_ipc_perm *msq, struct msg_msg *msg,
struct task_struct *target, struct task_struct *target,
long type, int mode) long type, int mode)
{ {
@ -5864,11 +5864,11 @@ static int selinux_msg_queue_msgrcv(struct msg_queue *msq, struct msg_msg *msg,
u32 sid = task_sid(target); u32 sid = task_sid(target);
int rc; int rc;
isec = msq->q_perm.security; isec = msq->security;
msec = msg->security; msec = msg->security;
ad.type = LSM_AUDIT_DATA_IPC; ad.type = LSM_AUDIT_DATA_IPC;
ad.u.ipc_id = msq->q_perm.key; ad.u.ipc_id = msq->key;
rc = avc_has_perm(&selinux_state, rc = avc_has_perm(&selinux_state,
sid, isec->sid, sid, isec->sid,

24
security/smack/smack_lsm.c
View File

@ -3208,9 +3208,9 @@ static int smack_sem_semop(struct kern_ipc_perm *sma, struct sembuf *sops,
* *
* Returns 0 * Returns 0
*/ */
static int smack_msg_queue_alloc_security(struct msg_queue *msq) static int smack_msg_queue_alloc_security(struct kern_ipc_perm *msq)
{ {
struct kern_ipc_perm *kisp = &msq->q_perm; struct kern_ipc_perm *kisp = msq;
struct smack_known *skp = smk_of_current(); struct smack_known *skp = smk_of_current();
kisp->security = skp; kisp->security = skp;
@ -3223,9 +3223,9 @@ static int smack_msg_queue_alloc_security(struct msg_queue *msq)
* *
* Clears the blob pointer * Clears the blob pointer
*/ */
static void smack_msg_queue_free_security(struct msg_queue *msq) static void smack_msg_queue_free_security(struct kern_ipc_perm *msq)
{ {
struct kern_ipc_perm *kisp = &msq->q_perm; struct kern_ipc_perm *kisp = msq;
kisp->security = NULL; kisp->security = NULL;
} }
@ -3236,9 +3236,9 @@ static void smack_msg_queue_free_security(struct msg_queue *msq)
* *
* Returns a pointer to the smack label entry * Returns a pointer to the smack label entry
*/ */
static struct smack_known *smack_of_msq(struct msg_queue *msq) static struct smack_known *smack_of_msq(struct kern_ipc_perm *msq)
{ {
return (struct smack_known *)msq->q_perm.security; return (struct smack_known *)msq->security;
} }
/** /**
@ -3248,7 +3248,7 @@ static struct smack_known *smack_of_msq(struct msg_queue *msq)
* *
* return 0 if current has access, error otherwise * return 0 if current has access, error otherwise
*/ */
static int smk_curacc_msq(struct msg_queue *msq, int access) static int smk_curacc_msq(struct kern_ipc_perm *msq, int access)
{ {
struct smack_known *msp = smack_of_msq(msq); struct smack_known *msp = smack_of_msq(msq);
struct smk_audit_info ad; struct smk_audit_info ad;
@ -3256,7 +3256,7 @@ static int smk_curacc_msq(struct msg_queue *msq, int access)
#ifdef CONFIG_AUDIT #ifdef CONFIG_AUDIT
smk_ad_init(&ad, __func__, LSM_AUDIT_DATA_IPC); smk_ad_init(&ad, __func__, LSM_AUDIT_DATA_IPC);
ad.a.u.ipc_id = msq->q_perm.id; ad.a.u.ipc_id = msq->id;
#endif #endif
rc = smk_curacc(msp, access, &ad); rc = smk_curacc(msp, access, &ad);
rc = smk_bu_current("msq", msp, access, rc); rc = smk_bu_current("msq", msp, access, rc);
@ -3270,7 +3270,7 @@ static int smk_curacc_msq(struct msg_queue *msq, int access)
* *
* Returns 0 if current has the requested access, error code otherwise * Returns 0 if current has the requested access, error code otherwise
*/ */
static int smack_msg_queue_associate(struct msg_queue *msq, int msqflg) static int smack_msg_queue_associate(struct kern_ipc_perm *msq, int msqflg)
{ {
int may; int may;
@ -3285,7 +3285,7 @@ static int smack_msg_queue_associate(struct msg_queue *msq, int msqflg)
* *
* Returns 0 if current has the requested access, error code otherwise * Returns 0 if current has the requested access, error code otherwise
*/ */
static int smack_msg_queue_msgctl(struct msg_queue *msq, int cmd) static int smack_msg_queue_msgctl(struct kern_ipc_perm *msq, int cmd)
{ {
int may; int may;
@ -3319,7 +3319,7 @@ static int smack_msg_queue_msgctl(struct msg_queue *msq, int cmd)
* *
* Returns 0 if current has the requested access, error code otherwise * Returns 0 if current has the requested access, error code otherwise
*/ */
static int smack_msg_queue_msgsnd(struct msg_queue *msq, struct msg_msg *msg, static int smack_msg_queue_msgsnd(struct kern_ipc_perm *msq, struct msg_msg *msg,
int msqflg) int msqflg)
{ {
int may; int may;
@ -3338,7 +3338,7 @@ static int smack_msg_queue_msgsnd(struct msg_queue *msq, struct msg_msg *msg,
* *
* Returns 0 if current has read and write access, error code otherwise * Returns 0 if current has read and write access, error code otherwise
*/ */
static int smack_msg_queue_msgrcv(struct msg_queue *msq, struct msg_msg *msg, static int smack_msg_queue_msgrcv(struct kern_ipc_perm *msq, struct msg_msg *msg,
struct task_struct *target, long type, int mode) struct task_struct *target, long type, int mode)
{ {
return smk_curacc_msq(msq, MAY_READWRITE); return smk_curacc_msq(msq, MAY_READWRITE);