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

Commit d25830e5 authored by Paul Moore's avatar Paul Moore Committed by David S. Miller
Browse files

netlabel: Fix a potential NULL pointer dereference 



Fix a potential NULL pointer dereference seen when trying to remove a
static label configuration with an invalid address/mask combination.

Signed-off-by: default avatarPaul Moore <paul.moore@hp.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent efba0180

net/netlabel/netlabel_unlabeled.c

+6 −4
Original line number Diff line number Diff line
@@ -574,9 +574,10 @@ static int netlbl_unlhsh_remove_addr4(struct net *net, 
	list_entry = netlbl_af4list_remove(addr->s_addr, mask->s_addr,

					   &iface->addr4_list);

	spin_unlock(&netlbl_unlhsh_lock);

	if (list_entry == NULL)

		ret_val = -ENOENT;

	if (list_entry != NULL)

		entry = netlbl_unlhsh_addr4_entry(list_entry);

	else

		ret_val = -ENOENT;



	audit_buf = netlbl_audit_start_common(AUDIT_MAC_UNLBL_STCDEL,

					      audit_info);
@@ -634,9 +635,10 @@ static int netlbl_unlhsh_remove_addr6(struct net *net, 
	spin_lock(&netlbl_unlhsh_lock);

	list_entry = netlbl_af6list_remove(addr, mask, &iface->addr6_list);

	spin_unlock(&netlbl_unlhsh_lock);

	if (list_entry == NULL)

		ret_val = -ENOENT;

	if (list_entry != NULL)

		entry = netlbl_unlhsh_addr6_entry(list_entry);

	else

		ret_val = -ENOENT;



	audit_buf = netlbl_audit_start_common(AUDIT_MAC_UNLBL_STCDEL,

					      audit_info);