* [PATCH net] dccp: fix a memleak for dccp_feat_init err process
@ 2017-07-26 6:20 Xin Long
2017-07-27 7:01 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Xin Long @ 2017-07-26 6:20 UTC (permalink / raw)
To: network dev; +Cc: davem
In dccp_feat_init, when ccid_get_builtin_ccids failsto alloc
memory for rx.val, it should free tx.val before returning an
error.
Signed-off-by: Xin Long <lucien.xin@gmail.com>
---
net/dccp/feat.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/net/dccp/feat.c b/net/dccp/feat.c
index 1704948..f227f00 100644
--- a/net/dccp/feat.c
+++ b/net/dccp/feat.c
@@ -1471,9 +1471,12 @@ int dccp_feat_init(struct sock *sk)
* singleton values (which always leads to failure).
* These settings can still (later) be overridden via sockopts.
*/
- if (ccid_get_builtin_ccids(&tx.val, &tx.len) ||
- ccid_get_builtin_ccids(&rx.val, &rx.len))
+ if (ccid_get_builtin_ccids(&tx.val, &tx.len))
return -ENOBUFS;
+ if (ccid_get_builtin_ccids(&rx.val, &rx.len)) {
+ kfree(tx.val);
+ return -ENOBUFS;
+ }
if (!dccp_feat_prefer(sysctl_dccp_tx_ccid, tx.val, tx.len) ||
!dccp_feat_prefer(sysctl_dccp_rx_ccid, rx.val, rx.len))
--
2.1.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH net] dccp: fix a memleak for dccp_feat_init err process
2017-07-26 6:20 [PATCH net] dccp: fix a memleak for dccp_feat_init err process Xin Long
@ 2017-07-27 7:01 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2017-07-27 7:01 UTC (permalink / raw)
To: lucien.xin; +Cc: netdev
From: Xin Long <lucien.xin@gmail.com>
Date: Wed, 26 Jul 2017 14:20:15 +0800
> In dccp_feat_init, when ccid_get_builtin_ccids failsto alloc
> memory for rx.val, it should free tx.val before returning an
> error.
>
> Signed-off-by: Xin Long <lucien.xin@gmail.com>
Also applied and queued up for -stable.
Thanks.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-07-27 7:01 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-07-26 6:20 [PATCH net] dccp: fix a memleak for dccp_feat_init err process Xin Long
2017-07-27 7:01 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).