[PATCH] knfsd: svcrpc: fix gss krb5i memory leak
The memory leak here is embarassingly obvious. This fixes a problem that causes the kernel to leak a small amount of memory every time it receives a integrity-protected request. Thanks to Aim Le Rouzic for the bug report. Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu> Signed-off-by: Neil Brown <neilb@suse.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
451c11a161
commit
b797b5beac
|
@ -804,19 +804,19 @@ unwrap_integ_data(struct xdr_buf *buf, u32 seq, struct gss_ctx *ctx)
|
||||||
|
|
||||||
integ_len = svc_getnl(&buf->head[0]);
|
integ_len = svc_getnl(&buf->head[0]);
|
||||||
if (integ_len & 3)
|
if (integ_len & 3)
|
||||||
goto out;
|
return stat;
|
||||||
if (integ_len > buf->len)
|
if (integ_len > buf->len)
|
||||||
goto out;
|
return stat;
|
||||||
if (xdr_buf_subsegment(buf, &integ_buf, 0, integ_len))
|
if (xdr_buf_subsegment(buf, &integ_buf, 0, integ_len))
|
||||||
BUG();
|
BUG();
|
||||||
/* copy out mic... */
|
/* copy out mic... */
|
||||||
if (read_u32_from_xdr_buf(buf, integ_len, &mic.len))
|
if (read_u32_from_xdr_buf(buf, integ_len, &mic.len))
|
||||||
BUG();
|
BUG();
|
||||||
if (mic.len > RPC_MAX_AUTH_SIZE)
|
if (mic.len > RPC_MAX_AUTH_SIZE)
|
||||||
goto out;
|
return stat;
|
||||||
mic.data = kmalloc(mic.len, GFP_KERNEL);
|
mic.data = kmalloc(mic.len, GFP_KERNEL);
|
||||||
if (!mic.data)
|
if (!mic.data)
|
||||||
goto out;
|
return stat;
|
||||||
if (read_bytes_from_xdr_buf(buf, integ_len + 4, mic.data, mic.len))
|
if (read_bytes_from_xdr_buf(buf, integ_len + 4, mic.data, mic.len))
|
||||||
goto out;
|
goto out;
|
||||||
maj_stat = gss_verify_mic(ctx, &integ_buf, &mic);
|
maj_stat = gss_verify_mic(ctx, &integ_buf, &mic);
|
||||||
|
@ -826,6 +826,7 @@ unwrap_integ_data(struct xdr_buf *buf, u32 seq, struct gss_ctx *ctx)
|
||||||
goto out;
|
goto out;
|
||||||
stat = 0;
|
stat = 0;
|
||||||
out:
|
out:
|
||||||
|
kfree(mic.data);
|
||||||
return stat;
|
return stat;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Reference in New Issue