Add a hook to invalidate an inode's security label when the cached information becomes invalid. Add the new hook in selinux: set a flag when a security label becomes invalid.
Showing the changes to security (3 of 5 files). Show all
Unified · Split
| @@ -1161,6 +1161,12 @@ void security_release_secctx(char *secdata, u32 seclen) · 1160 unmodified lines | ||
| 1161 | 1161 | } |
| 1162 | 1162 | EXPORT_SYMBOL(security_release_secctx); |
| 1163 | 1163 | |
| 1164 | +void security_inode_invalidate_secctx(struct inode *inode) | |
| 1165 | +{ | |
| 1166 | + call_void_hook(inode_invalidate_secctx, inode); | |
| 1167 | +} | |
| 1168 | +EXPORT_SYMBOL(security_inode_invalidate_secctx); | |
| 1169 | + | |
| 1164 | 1170 | int security_inode_notifysecctx(struct inode *inode, void *ctx, u32 ctxlen) |
| 1165 | 1171 | { |
| 1166 | 1172 | return call_int_hook(inode_notifysecctx, 0, inode, ctx, ctxlen); |
| @@ -1763,6 +1769,8 @@ struct security_hook_heads security_hook_heads = { · 596 unmodified lines | ||
| 1763 | 1769 | LIST_HEAD_INIT(security_hook_heads.secctx_to_secid), |
| 1764 | 1770 | .release_secctx = |
| 1765 | 1771 | LIST_HEAD_INIT(security_hook_heads.release_secctx), |
| 1772 | + .inode_invalidate_secctx = | |
| 1773 | + LIST_HEAD_INIT(security_hook_heads.inode_invalidate_secctx), | |
| 1766 | 1774 | .inode_notifysecctx = |
| 1767 | 1775 | LIST_HEAD_INIT(security_hook_heads.inode_notifysecctx), |
| 1768 | 1776 | .inode_setsecctx = |
| @@ -820,7 +820,7 @@ static int selinux_set_mnt_opts(struct super_block *sb, · 819 unmodified lines | ||
| 820 | 820 | goto out; |
| 821 | 821 | |
| 822 | 822 | root_isec->sid = rootcontext_sid; |
| 823 | − root_isec->initialized = 1; | |
| 823 | + root_isec->initialized = LABEL_INITIALIZED; | |
| 824 | 824 | } |
| 825 | 825 | |
| 826 | 826 | if (defcontext_sid) { |
| @@ -1308,11 +1308,11 @@ static int inode_doinit_with_dentry(struct inode *inode, struct dentry *opt_dent · 481 unmodified lines | ||
| 1308 | 1308 | unsigned len = 0; |
| 1309 | 1309 | int rc = 0; |
| 1310 | 1310 | |
| 1311 | − if (isec->initialized) | |
| 1311 | + if (isec->initialized == LABEL_INITIALIZED) | |
| 1312 | 1312 | goto out; |
| 1313 | 1313 | |
| 1314 | 1314 | mutex_lock(&isec->lock); |
| 1315 | − if (isec->initialized) | |
| 1315 | + if (isec->initialized == LABEL_INITIALIZED) | |
| 1316 | 1316 | goto out_unlock; |
| 1317 | 1317 | |
| 1318 | 1318 | sbsec = inode->i_sb->s_security; |
| @@ -1484,7 +1484,7 @@ static int inode_doinit_with_dentry(struct inode *inode, struct dentry *opt_dent · 165 unmodified lines | ||
| 1484 | 1484 | break; |
| 1485 | 1485 | } |
| 1486 | 1486 | |
| 1487 | − isec->initialized = 1; | |
| 1487 | + isec->initialized = LABEL_INITIALIZED; | |
| 1488 | 1488 | |
| 1489 | 1489 | out_unlock: |
| 1490 | 1490 | mutex_unlock(&isec->lock); |
| @@ -2790,7 +2790,7 @@ static int selinux_inode_init_security(struct inode *inode, struct inode *dir, · 1299 unmodified lines | ||
| 2790 | 2790 | struct inode_security_struct *isec = inode->i_security; |
| 2791 | 2791 | isec->sclass = inode_mode_to_security_class(inode->i_mode); |
| 2792 | 2792 | isec->sid = newsid; |
| 2793 | − isec->initialized = 1; | |
| 2793 | + isec->initialized = LABEL_INITIALIZED; | |
| 2794 | 2794 | } |
| 2795 | 2795 | |
| 2796 | 2796 | if (!ss_initialized || !(sbsec->flags & SBLABEL_MNT)) |
| @@ -3089,7 +3089,7 @@ static void selinux_inode_post_setxattr(struct dentry *dentry, const char *name, · 292 unmodified lines | ||
| 3089 | 3089 | |
| 3090 | 3090 | isec->sclass = inode_mode_to_security_class(inode->i_mode); |
| 3091 | 3091 | isec->sid = newsid; |
| 3092 | − isec->initialized = 1; | |
| 3092 | + isec->initialized = LABEL_INITIALIZED; | |
| 3093 | 3093 | |
| 3094 | 3094 | return; |
| 3095 | 3095 | } |
| @@ -3183,7 +3183,7 @@ static int selinux_inode_setsecurity(struct inode *inode, const char *name, · 87 unmodified lines | ||
| 3183 | 3183 | |
| 3184 | 3184 | isec->sclass = inode_mode_to_security_class(inode->i_mode); |
| 3185 | 3185 | isec->sid = newsid; |
| 3186 | − isec->initialized = 1; | |
| 3186 | + isec->initialized = LABEL_INITIALIZED; | |
| 3187 | 3187 | return 0; |
| 3188 | 3188 | } |
| 3189 | 3189 | |
| @@ -3761,7 +3761,7 @@ static void selinux_task_to_inode(struct task_struct *p, · 571 unmodified lines | ||
| 3761 | 3761 | u32 sid = task_sid(p); |
| 3762 | 3762 | |
| 3763 | 3763 | isec->sid = sid; |
| 3764 | − isec->initialized = 1; | |
| 3764 | + isec->initialized = LABEL_INITIALIZED; | |
| 3765 | 3765 | } |
| 3766 | 3766 | |
| 3767 | 3767 | /* Returns error only if unable to parse addresses */ |
| @@ -4092,7 +4092,7 @@ static int selinux_socket_post_create(struct socket *sock, int family, · 324 unmodified lines | ||
| 4092 | 4092 | return err; |
| 4093 | 4093 | } |
| 4094 | 4094 | |
| 4095 | − isec->initialized = 1; | |
| 4095 | + isec->initialized = LABEL_INITIALIZED; | |
| 4096 | 4096 | |
| 4097 | 4097 | if (sock->sk) { |
| 4098 | 4098 | sksec = sock->sk->sk_security; |
| @@ -4283,7 +4283,7 @@ static int selinux_socket_accept(struct socket *sock, struct socket *newsock) · 184 unmodified lines | ||
| 4283 | 4283 | isec = inode_security(SOCK_INODE(sock)); |
| 4284 | 4284 | newisec->sclass = isec->sclass; |
| 4285 | 4285 | newisec->sid = isec->sid; |
| 4286 | − newisec->initialized = 1; | |
| 4286 | + newisec->initialized = LABEL_INITIALIZED; | |
| 4287 | 4287 | |
| 4288 | 4288 | return 0; |
| 4289 | 4289 | } |
| @@ -5775,6 +5775,15 @@ static void selinux_release_secctx(char *secdata, u32 seclen) · 1485 unmodified lines | ||
| 5775 | 5775 | kfree(secdata); |
| 5776 | 5776 | } |
| 5777 | 5777 | |
| 5778 | +static void selinux_inode_invalidate_secctx(struct inode *inode) | |
| 5779 | +{ | |
| 5780 | + struct inode_security_struct *isec = inode->i_security; | |
| 5781 | + | |
| 5782 | + mutex_lock(&isec->lock); | |
| 5783 | + isec->initialized = LABEL_INVALID; | |
| 5784 | + mutex_unlock(&isec->lock); | |
| 5785 | +} | |
| 5786 | + | |
| 5778 | 5787 | /* |
| 5779 | 5788 | * called with inode->i_mutex locked |
| 5780 | 5789 | */ |
| @@ -6006,6 +6015,7 @@ static struct security_hook_list selinux_hooks[] = { · 225 unmodified lines | ||
| 6006 | 6015 | LSM_HOOK_INIT(secid_to_secctx, selinux_secid_to_secctx), |
| 6007 | 6016 | LSM_HOOK_INIT(secctx_to_secid, selinux_secctx_to_secid), |
| 6008 | 6017 | LSM_HOOK_INIT(release_secctx, selinux_release_secctx), |
| 6018 | + LSM_HOOK_INIT(inode_invalidate_secctx, selinux_inode_invalidate_secctx), | |
| 6009 | 6019 | LSM_HOOK_INIT(inode_notifysecctx, selinux_inode_notifysecctx), |
| 6010 | 6020 | LSM_HOOK_INIT(inode_setsecctx, selinux_inode_setsecctx), |
| 6011 | 6021 | LSM_HOOK_INIT(inode_getsecctx, selinux_inode_getsecctx), |
| @@ -37,6 +37,12 @@ struct task_security_struct { · 36 unmodified lines | ||
| 37 | 37 | u32 sockcreate_sid; /* fscreate SID */ |
| 38 | 38 | }; |
| 39 | 39 | |
| 40 | +enum label_initialized { | |
| 41 | + LABEL_MISSING, /* not initialized */ | |
| 42 | + LABEL_INITIALIZED, /* inizialized */ | |
| 43 | + LABEL_INVALID /* invalid */ | |
| 44 | +}; | |
| 45 | + | |
| 40 | 46 | struct inode_security_struct { |
| 41 | 47 | struct inode *inode; /* back pointer to inode object */ |
| 42 | 48 | union { |