The patch titled Subject: 9p: check memory allocation result for cachetag has been added to the -mm tree. Its filename is 9p-check-memory-allocation-result-for-cachetag.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/9p-check-memory-allocation-result-for-cachetag.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/9p-check-memory-allocation-result-for-cachetag.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Chengguang Xu <cgxu519@xxxxxxx> Subject: 9p: check memory allocation result for cachetag Check memory allocation result for cachetag in mount option parsing and fix potential memory leak in the error case. Link: http://lkml.kernel.org/r/1521614889-73446-1-git-send-email-cgxu519@xxxxxxx Signed-off-by: Chengguang Xu <cgxu519@xxxxxxx> Reviewed-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Cc: Eric Van Hensbergen <ericvh@xxxxxxxxx> Cc: Ron Minnich <rminnich@xxxxxxxxxx> Cc: Latchesar Ionkov <lucho@xxxxxxxxxx> Cc: <v9fs-developer@xxxxxxxxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- fs/9p/v9fs.c | 7 +++++++ 1 file changed, 7 insertions(+) diff -puN fs/9p/v9fs.c~9p-check-memory-allocation-result-for-cachetag fs/9p/v9fs.c --- a/fs/9p/v9fs.c~9p-check-memory-allocation-result-for-cachetag +++ a/fs/9p/v9fs.c @@ -292,6 +292,10 @@ static int v9fs_parse_options(struct v9f #ifdef CONFIG_9P_FSCACHE kfree(v9ses->cachetag); v9ses->cachetag = match_strdup(&args[0]); + if (!v9ses->cachetag) { + ret = -ENOMEM; + goto free_and_return; + } #endif break; case Opt_cache: @@ -471,6 +475,9 @@ struct p9_fid *v9fs_session_init(struct return fid; err_clnt: +#ifdef CONFIG_9P_FSCACHE + kfree(v9ses->cachetag); +#endif p9_client_destroy(v9ses->clnt); err_names: kfree(v9ses->uname); _ Patches currently in -mm which might be from cgxu519@xxxxxxx are 9p-check-memory-allocation-result-for-cachetag.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html