Commit dd4edbcb authored by Xin Long's avatar Xin Long Committed by Greg Kroah-Hartman

dccp: fix a memleak for dccp_feat_init err process


[ Upstream commit e90ce2fc ]

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: default avatarXin Long <lucien.xin@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent adcc8785
...@@ -1471,9 +1471,12 @@ int dccp_feat_init(struct sock *sk) ...@@ -1471,9 +1471,12 @@ int dccp_feat_init(struct sock *sk)
* singleton values (which always leads to failure). * singleton values (which always leads to failure).
* These settings can still (later) be overridden via sockopts. * These settings can still (later) be overridden via sockopts.
*/ */
if (ccid_get_builtin_ccids(&tx.val, &tx.len) || if (ccid_get_builtin_ccids(&tx.val, &tx.len))
ccid_get_builtin_ccids(&rx.val, &rx.len))
return -ENOBUFS; 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) || if (!dccp_feat_prefer(sysctl_dccp_tx_ccid, tx.val, tx.len) ||
!dccp_feat_prefer(sysctl_dccp_rx_ccid, rx.val, rx.len)) !dccp_feat_prefer(sysctl_dccp_rx_ccid, rx.val, rx.len))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment