selinux: Add helper functions to get and set checkreqprot
PATCH v4 1/1 selinux: Add helper functions to get and set checkreqprot
checkreqprot data member in selinux_state struct is accessed directly by SELinux functions to get and set. This could cause unexpected read or write access to this data member due to compiler optimizations and/or compiler's reordering of access to this field.
Add helper functions to get and set checkreqprot data member in selinux_state struct. These helper functions use READ_ONCE and WRITE_ONCE macros to ensure atomic read or write of memory for this data member.
--- security/selinux/hooks.c | 6 +++--- security/selinux/include/security.h | 10 ++++++++++ security/selinux/selinuxfs.c | 5 +++-- 3 files changed, 16 insertions(+), 5 deletions(-)
security/selinux/hooks.c +3 -3
@@ -3718,7 +3718,7 @@ static int selinux_mmap_file(struct file *file, unsigned long reqprot,return rc; } -if (selinux_state.checkreqprot) +if (checkreqprot_get (&selinux_state)) prot = reqprot; return file_map_prot_check(file, prot,
@@ -3732,7 +3732,7 @@ static int selinux_file_mprotect(struct vm_area_struct *vma,const struct cred *cred =current_cred ();u32 sid =cred_sid (cred); -if (selinux_state.checkreqprot) +if (checkreqprot_get (&selinux_state)) prot = reqprot; if (default_noexec &&
@@ -7234,7 +7234,7 @@ static __init int selinux_init(void)memset (&selinux_state,0 ,sizeof (selinux_state));enforcing_set (&selinux_state, selinux_enforcing_boot); - selinux_state.checkreqprot = selinux_checkreqprot_boot; +checkreqprot_set (&selinux_state, selinux_checkreqprot_boot);selinux_avc_init (&selinux_state.avc);mutex_init (&selinux_state.status_lock);mutex_init (&selinux_state.policy_mutex);
security/selinux/include/security.h +10 -0
@@ -143,6 +143,16 @@ static inline void enforcing_set(struct selinux_state *state, bool value) }#endif +static inline bool checkreqprot_get (const struct selinux_state *state) +{ +return READ_ONCE (state->checkreqprot); +} + +static inline void checkreqprot_set (struct selinux_state *state,bool value) +{ +WRITE_ONCE (state->checkreqprot, value); +} +#ifdef CONFIG_SECURITY_SELINUX_DISABLE static inline bool selinux_disabled (struct selinux_state *state) {
security/selinux/selinuxfs.c +3 -2
@@ -717,7 +717,8 @@ static ssize_t sel_read_checkreqprot(struct file *filp, char __user *buf,char tmpbuf[TMPBUFLEN ];ssize_t length; - length =scnprintf (tmpbuf,TMPBUFLEN ,"%u" , fsi->state->checkreqprot); + length =scnprintf (tmpbuf,TMPBUFLEN ,"%u" , +checkreqprot_get (fsi->state));return simple_read_from_buffer (buf, count, ppos, tmpbuf, length); }
@@ -759,7 +760,7 @@ static ssize_t sel_write_checkreqprot(struct file *file, const char __user *buf, comm, current->pid); } - fsi->state->checkreqprot = new_value ?1 :0 ; +checkreqprot_set (fsi->state, (new_value ?1 :0 )); length = count; out:kfree (page);
Signature · 1 line
2.28.0
Quoted 6 lines · Lakshmi Ramasubramanian
checkreqprot data member in
selinux_statestruct is accessed directly by SELinux functions to get and set. This could cause unexpected read or write access to this data member due to compiler optimizations and/or compiler's reordering of access to this field.
Quoted 8 lines
Add helper functions to get and set checkreqprot data member in
selinux_statestruct. These helper functions useREAD_ONCEandWRITE_ONCEmacros to ensure atomic read or write of memory for this data member.Signed-off-by Lakshmi Ramasubramanian <[email protected]>Suggested-by Stephen Smalley <[email protected]>Suggested-by Paul Moore <[email protected]>
Quoted 11 lines · Lakshmi Ramasubramanian
checkreqprot data member in
selinux_statestruct is accessed directly by SELinux functions to get and set. This could cause unexpected read or write access to this data member due to compiler optimizations and/or compiler's reordering of access to this field.Add helper functions to get and set checkreqprot data member in
selinux_statestruct. These helper functions useREAD_ONCEandWRITE_ONCEmacros to ensure atomic read or write of memory for this data member.
Quoted 8 lines
Signed-off-by Lakshmi Ramasubramanian <[email protected]>Suggested-by Stephen Smalley <[email protected]>Suggested-by Paul Moore <[email protected]>--- security/selinux/hooks.c | 6 +++--- security/selinux/include/security.h | 10 ++++++++++ security/selinux/selinuxfs.c | 5 +++-- 3 files changed, 16 insertions(+), 5 deletions(-)
Merged into selinux/next, thanks Lakshmi!
Signature · 2 lines
paul moore www.paul-moore.com