diff options
| author | Xin Long <lucien.xin@gmail.com> | 2017-07-26 14:20:15 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-08-11 08:33:57 -0700 |
| commit | 1f1ac346f3afd36663845a30b7dc8cf8f268b010 (patch) | |
| tree | 289b151846f88d04619ea03534f121af2288a5a9 /net | |
| parent | 240ad1a4f36005156b6a11af96bb0130ef2ad882 (diff) | |
| download | linux-1f1ac346f3afd36663845a30b7dc8cf8f268b010.tar.gz linux-1f1ac346f3afd36663845a30b7dc8cf8f268b010.tar.bz2 linux-1f1ac346f3afd36663845a30b7dc8cf8f268b010.zip | |
dccp: fix a memleak for dccp_feat_init err process
[ 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 <lucien.xin@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net')
| -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)) |