Re: [PATCH net] dccp: fix a memleak for dccp_feat_init err process

[David Miller]

From: Xin Long 
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 

Also applied and queued up for -stable.

Thanks.

[PATCH net] dccp: fix a memleak for dccp_feat_init err process

[Xin Long]

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 
---
 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(, ) ||
-   ccid_get_builtin_ccids(, ))
+   if (ccid_get_builtin_ccids(, ))
return -ENOBUFS;
+   if (ccid_get_builtin_ccids(, )) {
+   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