History

security: Add hook to invalidate inode security labels

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.

Andreas Gruenbacher committed 10 years ago

Commit 6f3be9f1 parent 83da53c5 files · +45 −10Browse files

Showing the changes to security (3 of 5 files). Show all

Unified · Split

3 files
  1. security/security.c +8 −0
  2. security/selinux/hooks.c +20 −10
  3. security/selinux/include/objsec.h +6 −0
security/security.c+8−0
@@ -1161,6 +1161,12 @@ void security_release_secctx(char *secdata, u32 seclen) · 1160 unmodified lines
11611161 }
11621162 EXPORT_SYMBOL(security_release_secctx);
11631163
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+
11641170 int security_inode_notifysecctx(struct inode *inode, void *ctx, u32 ctxlen)
11651171 {
11661172 return call_int_hook(inode_notifysecctx, 0, inode, ctx, ctxlen);
@@ -1763,6 +1769,8 @@ struct security_hook_heads security_hook_heads = { · 596 unmodified lines
17631769 LIST_HEAD_INIT(security_hook_heads.secctx_to_secid),
17641770 .release_secctx =
17651771 LIST_HEAD_INIT(security_hook_heads.release_secctx),
1772+ .inode_invalidate_secctx =
1773+ LIST_HEAD_INIT(security_hook_heads.inode_invalidate_secctx),
17661774 .inode_notifysecctx =
17671775 LIST_HEAD_INIT(security_hook_heads.inode_notifysecctx),
17681776 .inode_setsecctx =
security/selinux/hooks.c+20−10
@@ -820,7 +820,7 @@ static int selinux_set_mnt_opts(struct super_block *sb, · 819 unmodified lines
820820 goto out;
821821
822822 root_isec->sid = rootcontext_sid;
823− root_isec->initialized = 1;
823+ root_isec->initialized = LABEL_INITIALIZED;
824824 }
825825
826826 if (defcontext_sid) {
@@ -1308,11 +1308,11 @@ static int inode_doinit_with_dentry(struct inode *inode, struct dentry *opt_dent · 481 unmodified lines
13081308 unsigned len = 0;
13091309 int rc = 0;
13101310
1311− if (isec->initialized)
1311+ if (isec->initialized == LABEL_INITIALIZED)
13121312 goto out;
13131313
13141314 mutex_lock(&isec->lock);
1315− if (isec->initialized)
1315+ if (isec->initialized == LABEL_INITIALIZED)
13161316 goto out_unlock;
13171317
13181318 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
14841484 break;
14851485 }
14861486
1487− isec->initialized = 1;
1487+ isec->initialized = LABEL_INITIALIZED;
14881488
14891489 out_unlock:
14901490 mutex_unlock(&isec->lock);
@@ -2790,7 +2790,7 @@ static int selinux_inode_init_security(struct inode *inode, struct inode *dir, · 1299 unmodified lines
27902790 struct inode_security_struct *isec = inode->i_security;
27912791 isec->sclass = inode_mode_to_security_class(inode->i_mode);
27922792 isec->sid = newsid;
2793− isec->initialized = 1;
2793+ isec->initialized = LABEL_INITIALIZED;
27942794 }
27952795
27962796 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
30893089
30903090 isec->sclass = inode_mode_to_security_class(inode->i_mode);
30913091 isec->sid = newsid;
3092− isec->initialized = 1;
3092+ isec->initialized = LABEL_INITIALIZED;
30933093
30943094 return;
30953095 }
@@ -3183,7 +3183,7 @@ static int selinux_inode_setsecurity(struct inode *inode, const char *name, · 87 unmodified lines
31833183
31843184 isec->sclass = inode_mode_to_security_class(inode->i_mode);
31853185 isec->sid = newsid;
3186− isec->initialized = 1;
3186+ isec->initialized = LABEL_INITIALIZED;
31873187 return 0;
31883188 }
31893189
@@ -3761,7 +3761,7 @@ static void selinux_task_to_inode(struct task_struct *p, · 571 unmodified lines
37613761 u32 sid = task_sid(p);
37623762
37633763 isec->sid = sid;
3764− isec->initialized = 1;
3764+ isec->initialized = LABEL_INITIALIZED;
37653765 }
37663766
37673767 /* 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
40924092 return err;
40934093 }
40944094
4095− isec->initialized = 1;
4095+ isec->initialized = LABEL_INITIALIZED;
40964096
40974097 if (sock->sk) {
40984098 sksec = sock->sk->sk_security;
@@ -4283,7 +4283,7 @@ static int selinux_socket_accept(struct socket *sock, struct socket *newsock) · 184 unmodified lines
42834283 isec = inode_security(SOCK_INODE(sock));
42844284 newisec->sclass = isec->sclass;
42854285 newisec->sid = isec->sid;
4286− newisec->initialized = 1;
4286+ newisec->initialized = LABEL_INITIALIZED;
42874287
42884288 return 0;
42894289 }
@@ -5775,6 +5775,15 @@ static void selinux_release_secctx(char *secdata, u32 seclen) · 1485 unmodified lines
57755775 kfree(secdata);
57765776 }
57775777
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+
57785787 /*
57795788 * called with inode->i_mutex locked
57805789 */
@@ -6006,6 +6015,7 @@ static struct security_hook_list selinux_hooks[] = { · 225 unmodified lines
60066015 LSM_HOOK_INIT(secid_to_secctx, selinux_secid_to_secctx),
60076016 LSM_HOOK_INIT(secctx_to_secid, selinux_secctx_to_secid),
60086017 LSM_HOOK_INIT(release_secctx, selinux_release_secctx),
6018+ LSM_HOOK_INIT(inode_invalidate_secctx, selinux_inode_invalidate_secctx),
60096019 LSM_HOOK_INIT(inode_notifysecctx, selinux_inode_notifysecctx),
60106020 LSM_HOOK_INIT(inode_setsecctx, selinux_inode_setsecctx),
60116021 LSM_HOOK_INIT(inode_getsecctx, selinux_inode_getsecctx),
security/selinux/include/objsec.h+6−0
@@ -37,6 +37,12 @@ struct task_security_struct { · 36 unmodified lines
3737 u32 sockcreate_sid; /* fscreate SID */
3838 };
3939
40+enum label_initialized {
41+ LABEL_MISSING, /* not initialized */
42+ LABEL_INITIALIZED, /* inizialized */
43+ LABEL_INVALID /* invalid */
44+};
45+
4046 struct inode_security_struct {
4147 struct inode *inode; /* back pointer to inode object */
4248 union {

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t