diff options
| author | Xin Long <lucien.xin@gmail.com> | 2017-07-26 14:20:15 +0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-07-27 00:01:05 -0700 |
| commit | e90ce2fc27cad7e7b1e72b9e66201a7a4c124c2b (patch) | |
| tree | 531710bf6f3bf84b7c5a45ed61d55115043b90ff /net/dccp | |
| parent | b7953d3c0e30a5fc944f6b7bd0bcceb0794bcd85 (diff) | |
| download | linux-e90ce2fc27cad7e7b1e72b9e66201a7a4c124c2b.tar.gz linux-e90ce2fc27cad7e7b1e72b9e66201a7a4c124c2b.tar.bz2 linux-e90ce2fc27cad7e7b1e72b9e66201a7a4c124c2b.zip | |
dccp: fix a memleak for dccp_feat_init err process
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/dccp')
| -rw-r--r-- | net/dccp/feat.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/net/dccp/feat.c b/net/dccp/feat.c index 1704948e6a12..f227f002c73d 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)) |