aboutsummaryrefslogtreecommitdiffstats
path: root/security/smack
diff options
context:
space:
mode:
authorSergio Luis <sergio@larces.uece.br>2008-12-21 23:16:15 -0500
committerJames Morris <jmorris@namei.org>2008-12-24 20:14:55 -0500
commit81ea714bf148fce35e931edcbdfd3aedda20d1dc (patch)
treee3cabfd2ce35bc8be542910bffc4b9b99288a7f4 /security/smack
parent74192246910ff4fb95309ba1a683215644beeb62 (diff)
smackfs: check for allocation failures in smk_set_access()
smackfs: check for allocation failures in smk_set_access() While adding a new subject/object pair to smack_list, smk_set_access() didn't check the return of kzalloc(). This patch changes smk_set_access() to return 0 or -ENOMEM, based on kzalloc()'s return. It also updates its caller, smk_write_load(), to check for smk_set_access()'s return, given it is no longer a void return function. Signed-off-by: Sergio Luis <sergio@larces.uece.br> To: Casey Schaufler <casey@schaufler-ca.com> Cc: Ahmed S. Darwish <darwish.07@gmail.com> Cc: LSM <linux-security-module@vger.kernel.org> Cc: LKLM <linux-kernel@vger.kernel.org> Acked-by: Casey Schaufler <casey@schaufler-ca.com>
Diffstat (limited to 'security/smack')
-rw-r--r--security/smack/smackfs.c20
1 files changed, 16 insertions, 4 deletions
diff --git a/security/smack/smackfs.c b/security/smack/smackfs.c
index ca257dfdc75d..247dc9ebbc71 100644
--- a/security/smack/smackfs.c
+++ b/security/smack/smackfs.c
@@ -185,11 +185,15 @@ static int smk_open_load(struct inode *inode, struct file *file)
185 * the subject/object pair and replaces the access that was 185 * the subject/object pair and replaces the access that was
186 * there. If the pair isn't found add it with the specified 186 * there. If the pair isn't found add it with the specified
187 * access. 187 * access.
188 *
189 * Returns 0 if nothing goes wrong or -ENOMEM if it fails
190 * during the allocation of the new pair to add.
188 */ 191 */
189static void smk_set_access(struct smack_rule *srp) 192static int smk_set_access(struct smack_rule *srp)
190{ 193{
191 struct smk_list_entry *sp; 194 struct smk_list_entry *sp;
192 struct smk_list_entry *newp; 195 struct smk_list_entry *newp;
196 int ret = 0;
193 197
194 mutex_lock(&smack_list_lock); 198 mutex_lock(&smack_list_lock);
195 199
@@ -202,14 +206,20 @@ static void smk_set_access(struct smack_rule *srp)
202 206
203 if (sp == NULL) { 207 if (sp == NULL) {
204 newp = kzalloc(sizeof(struct smk_list_entry), GFP_KERNEL); 208 newp = kzalloc(sizeof(struct smk_list_entry), GFP_KERNEL);
209 if (newp == NULL) {
210 ret = -ENOMEM;
211 goto out;
212 }
213
205 newp->smk_rule = *srp; 214 newp->smk_rule = *srp;
206 newp->smk_next = smack_list; 215 newp->smk_next = smack_list;
207 smack_list = newp; 216 smack_list = newp;
208 } 217 }
209 218
219out:
210 mutex_unlock(&smack_list_lock); 220 mutex_unlock(&smack_list_lock);
211 221
212 return; 222 return ret;
213} 223}
214 224
215/** 225/**
@@ -309,8 +319,10 @@ static ssize_t smk_write_load(struct file *file, const char __user *buf,
309 goto out; 319 goto out;
310 } 320 }
311 321
312 smk_set_access(&rule); 322 rc = smk_set_access(&rule);
313 rc = count; 323
324 if (!rc)
325 rc = count;
314 326
315out: 327out:
316 kfree(data); 328 kfree(data);