diff options
| author | Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp> | 2013-05-27 20:11:27 +0900 |
|---|---|---|
| committer | Heikki Krogerus <heikki.krogerus@linux.intel.com> | 2013-11-11 14:11:41 +0200 |
| commit | 16e9e511732bd71e830a2b631a935fd7e76ba113 (patch) | |
| tree | 26b7623fd3c3075382bef141fdea789d799f865a | |
| parent | 0a42de05de59376fd850b768e9f77ba2cb4ba84d (diff) | |
| download | kernel-mfld-blackbay-16e9e511732bd71e830a2b631a935fd7e76ba113.tar.gz kernel-mfld-blackbay-16e9e511732bd71e830a2b631a935fd7e76ba113.tar.bz2 kernel-mfld-blackbay-16e9e511732bd71e830a2b631a935fd7e76ba113.zip | |
Smack: Fix possible NULL pointer dereference at smk_netlbl_mls()
netlbl_secattr_catmap_alloc(GFP_ATOMIC) can return NULL.
(Upstream commit id: 8cd77a0bd4b4a7d02c2a6926a69585d8088ee721)
Signed-off-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
| -rw-r--r-- | security/smack/smack_access.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/security/smack/smack_access.c b/security/smack/smack_access.c index 425a6a212d1..bd8338f9b8c 100644 --- a/security/smack/smack_access.c +++ b/security/smack/smack_access.c @@ -402,6 +402,8 @@ int smk_netlbl_mls(int level, char *catset, struct netlbl_lsm_secattr *sap, sap->flags |= NETLBL_SECATTR_MLS_CAT; sap->attr.mls.lvl = level; sap->attr.mls.cat = netlbl_secattr_catmap_alloc(GFP_ATOMIC); + if (!sap->attr.mls.cat) + return -ENOMEM; sap->attr.mls.cat->startbit = 0; for (cat = 1, cp = catset, byte = 0; byte < len; cp++, byte++) |