[PATCH 4.12 082/106] dccp: fix a memleak for dccp_feat_init err process

[Greg Kroah-Hartman]

4.12-stable review patch.  If anyone has any objections, please let me know.

--

From: Xin Long 


[ Upstream commit e90ce2fc27cad7e7b1e72b9e66201a7a4c124c2b ]

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 
Signed-off-by: David S. Miller 
Signed-off-by: Greg Kroah-Hartman 
---
 net/dccp/feat.c |7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

--- 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))

[PATCH 4.12 082/106] dccp: fix a memleak for dccp_feat_init err process

[Greg Kroah-Hartman]

4.12-stable review patch.  If anyone has any objections, please let me know.

--

From: Xin Long 


[ Upstream commit e90ce2fc27cad7e7b1e72b9e66201a7a4c124c2b ]

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 
Signed-off-by: David S. Miller 
Signed-off-by: Greg Kroah-Hartman 
---
 net/dccp/feat.c |7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

--- 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))