diff mbox series

[next] smack: fix two memory leaks in smack_add_opt

Message ID 20181222122750.13075-1-colin.king@canonical.com (mailing list archive)
State New, archived
Headers show
Series [next] smack: fix two memory leaks in smack_add_opt | expand

Commit Message

Colin King Dec. 22, 2018, 12:27 p.m. UTC 
From: Colin Ian King <colin.king@canonical.com>

Currently if s is null or when returning via the error exit label
out_opt_err leaks of the allocated opts can occur. Fix the leak
on the null s case by checking s is null before the allocation. Fix
the leak on the exit path by checking if opts was allocated by
kfree'ing opts.

Detected by CoverityScan, CID#1475953 ("Resource leak")

Fixes: b2130173efae ("smack: take the guts of smack_parse_opts_str() into a new helper")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
 security/smack/smack_lsm.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

Comments

Al Viro Dec. 22, 2018, 7:34 p.m. UTC | #1 
On Sat, Dec 22, 2018 at 12:27:50PM +0000, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
> 
> Currently if s is null or when returning via the error exit label
> out_opt_err leaks of the allocated opts can occur. Fix the leak
> on the null s case by checking s is null before the allocation. Fix
> the leak on the exit path by checking if opts was allocated by
> kfree'ing opts.
> 
> Detected by CoverityScan, CID#1475953 ("Resource leak")
> 
> Fixes: b2130173efae ("smack: take the guts of smack_parse_opts_str() into a new helper")
> Signed-off-by: Colin Ian King <colin.king@canonical.com>

There's a better fix in local tree, will go into -next tonight.
Colin King Dec. 22, 2018, 11:03 p.m. UTC | #2 
On 22/12/2018 19:34, Al Viro wrote:
> On Sat, Dec 22, 2018 at 12:27:50PM +0000, Colin King wrote:
>> From: Colin Ian King <colin.king@canonical.com>
>>
>> Currently if s is null or when returning via the error exit label
>> out_opt_err leaks of the allocated opts can occur. Fix the leak
>> on the null s case by checking s is null before the allocation. Fix
>> the leak on the exit path by checking if opts was allocated by
>> kfree'ing opts.
>>
>> Detected by CoverityScan, CID#1475953 ("Resource leak")
>>
>> Fixes: b2130173efae ("smack: take the guts of smack_parse_opts_str() into a new helper")
>> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> 
> There's a better fix in local tree, will go into -next tonight.
> 
OK, sounds good to me. Thanks

Colin
diff mbox series

Patch

diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c
index 84f72116a027..b5dc520adaa2 100644
--- a/security/smack/smack_lsm.c
+++ b/security/smack/smack_lsm.c
@@ -604,13 +604,13 @@  static int smack_add_opt(int token, const char *s, void **mnt_opts)
 {
 	struct smack_mnt_opts *opts = *mnt_opts;
 
+	if (!s)
+		return -ENOMEM;
 	if (!opts) {
 		opts = kzalloc(sizeof(struct smack_mnt_opts), GFP_KERNEL);
 		if (!opts)
 			return -ENOMEM;
 	}
-	if (!s)
-		return -ENOMEM;
 
 	switch (token) {
 	case Opt_fsdefault:
@@ -644,6 +644,8 @@  static int smack_add_opt(int token, const char *s, void **mnt_opts)
 
 out_opt_err:
 	pr_warn("Smack: duplicate mount options\n");
+	if (opts != *mnt_opts)
+		kfree(opts);
 	return -EINVAL;
 }