diff options
| author | José Bollo <jose.bollo@open.eurogiciel.org> | 2014-01-08 15:53:05 +0100 |
|---|---|---|
| committer | Casey Schaufler <casey@schaufler-ca.com> | 2014-04-11 14:33:59 -0700 |
| commit | 55dfc5da1a9b7e623b6f35620c74280555df0288 (patch) | |
| tree | 684c885270fdf52de7639aba8ebcc4dd86836b96 /security | |
| parent | f64410ec665479d7b4b77b7519e814253ed0f686 (diff) | |
| download | linux-55dfc5da1a9b7e623b6f35620c74280555df0288.tar.gz linux-55dfc5da1a9b7e623b6f35620c74280555df0288.tar.bz2 linux-55dfc5da1a9b7e623b6f35620c74280555df0288.zip | |
Minor improvement of 'smack_sb_kern_mount'
Fix a possible memory access fault when transmute is true and isp is NULL.
Signed-off-by: José Bollo <jose.bollo@open.eurogiciel.org>
Diffstat (limited to 'security')
| -rw-r--r-- | security/smack/smack_lsm.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c index d814e35987be..efa42991235e 100644 --- a/security/smack/smack_lsm.c +++ b/security/smack/smack_lsm.c @@ -413,9 +413,11 @@ static int smack_sb_kern_mount(struct super_block *sb, int flags, void *data) * Initialize the root inode. */ isp = inode->i_security; - if (inode->i_security == NULL) { - inode->i_security = new_inode_smack(sp->smk_root); - isp = inode->i_security; + if (isp == NULL) { + isp = new_inode_smack(sp->smk_root); + if (isp == NULL) + return -ENOMEM; + inode->i_security = isp; } else isp->smk_inode = sp->smk_root; |