mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-06 08:46:46 +00:00
SUNRPC: fix a memleak in gss_import_v2_context
[ Upstream commite67b652d8e
] The ctx->mech_used.data allocated by kmemdup is not freed in neither gss_import_v2_context nor it only caller gss_krb5_import_sec_context, which frees ctx on error. Thus, this patch reform the last call of gss_import_v2_context to the gss_krb5_import_ctx_v2, preventing the memleak while keepping the return formation. Fixes:47d8480776
("gss_krb5: handle new context format from gssd") Signed-off-by: Zhipeng Lu <alexious@zju.edu.cn> Reviewed-by: Jeff Layton <jlayton@kernel.org> Signed-off-by: Chuck Lever <chuck.lever@oracle.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
ae7079238f
commit
47ac11db93
1 changed files with 10 additions and 1 deletions
|
@ -398,6 +398,7 @@ gss_import_v2_context(const void *p, const void *end, struct krb5_ctx *ctx,
|
|||
u64 seq_send64;
|
||||
int keylen;
|
||||
u32 time32;
|
||||
int ret;
|
||||
|
||||
p = simple_get_bytes(p, end, &ctx->flags, sizeof(ctx->flags));
|
||||
if (IS_ERR(p))
|
||||
|
@ -450,8 +451,16 @@ gss_import_v2_context(const void *p, const void *end, struct krb5_ctx *ctx,
|
|||
}
|
||||
ctx->mech_used.len = gss_kerberos_mech.gm_oid.len;
|
||||
|
||||
return gss_krb5_import_ctx_v2(ctx, gfp_mask);
|
||||
ret = gss_krb5_import_ctx_v2(ctx, gfp_mask);
|
||||
if (ret) {
|
||||
p = ERR_PTR(ret);
|
||||
goto out_free;
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
||||
out_free:
|
||||
kfree(ctx->mech_used.data);
|
||||
out_err:
|
||||
return PTR_ERR(p);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue