Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9e0e9e16 authored by Xin Long's avatar Xin Long Committed by Greg Kroah-Hartman
Browse files

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: 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 ca604c89

net/dccp/feat.c

+5 −2
Original line number Diff line number Diff line
@@ -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))