[PATCH] smack: Fix a memory leak in smack_add_opt()

Dan Carpenter
2018-12-21T09:10:26Z

The function is leaking "opts" on the error paths.

Fixes: 90e3b564ab93 ("smack: take the guts of smack_parse_opts_str() into a new helper")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
security/smack/smack_lsm.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c
index 2adafc1018d9..4e9cdb942677 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:
@@ -643,6 +643,8 @@ static int smack_add_opt(int token, const char *s, void **mnt_opts)
return 0;

out_opt_err:
+ if (opts != *mnt_opts)
+ kfree(opts);
pr_warn("Smack: duplicate mount options\n");
return -EINVAL;
}
--
2.17.1