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

Commit a44af1c6 authored by Paul Moore's avatar Paul Moore Committed by Greg Kroah-Hartman
Browse files

cipso,calipso: resolve a number of problems with the DOI refcounts 



commit ad5d07f4a9cd671233ae20983848874731102c08 upstream.

The current CIPSO and CALIPSO refcounting scheme for the DOI
definitions is a bit flawed in that we:

1. Don't correctly match gets/puts in netlbl_cipsov4_list().
2. Decrement the refcount on each attempt to remove the DOI from the
   DOI list, only removing it from the list once the refcount drops
   to zero.

This patch fixes these problems by adding the missing "puts" to
netlbl_cipsov4_list() and introduces a more conventional, i.e.
not-buggy, refcounting mechanism to the DOI definitions.  Upon the
addition of a DOI to the DOI list, it is initialized with a refcount
of one, removing a DOI from the list removes it from the list and
drops the refcount by one; "gets" and "puts" behave as expected with
respect to refcounts, increasing and decreasing the DOI's refcount by
one.

Fixes: b1edeb10 ("netlabel: Replace protocol/NetLabel linking with refrerence counts")
Fixes: d7cce015 ("netlabel: Add support for removing a CALIPSO DOI.")
Reported-by: default avatar <syzbot+9ec037722d2603a9f52e@syzkaller.appspotmail.com>
Signed-off-by: default avatarPaul Moore <paul@paul-moore.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1466f689

net/ipv4/cipso_ipv4.c

+1 −10
Original line number Diff line number Diff line
@@ -533,16 +533,10 @@ int cipso_v4_doi_remove(u32 doi, struct netlbl_audit *audit_info) 
		ret_val = -ENOENT;

		goto doi_remove_return;

	}

	if (!refcount_dec_and_test(&doi_def->refcount)) {

		spin_unlock(&cipso_v4_doi_list_lock);

		ret_val = -EBUSY;

		goto doi_remove_return;

	}

	list_del_rcu(&doi_def->list);

	spin_unlock(&cipso_v4_doi_list_lock);



	cipso_v4_cache_invalidate();

	call_rcu(&doi_def->rcu, cipso_v4_doi_free_rcu);

	cipso_v4_doi_putdef(doi_def);

	ret_val = 0;



doi_remove_return:
@@ -599,9 +593,6 @@ void cipso_v4_doi_putdef(struct cipso_v4_doi *doi_def) 


	if (!refcount_dec_and_test(&doi_def->refcount))

		return;

	spin_lock(&cipso_v4_doi_list_lock);

	list_del_rcu(&doi_def->list);

	spin_unlock(&cipso_v4_doi_list_lock);



	cipso_v4_cache_invalidate();

	call_rcu(&doi_def->rcu, cipso_v4_doi_free_rcu);

net/ipv6/calipso.c

+5 −9
Original line number Diff line number Diff line
@@ -97,6 +97,9 @@ struct calipso_map_cache_entry { 


static struct calipso_map_cache_bkt *calipso_cache;



static void calipso_cache_invalidate(void);

static void calipso_doi_putdef(struct calipso_doi *doi_def);



/* Label Mapping Cache Functions

 */
@@ -458,15 +461,10 @@ static int calipso_doi_remove(u32 doi, struct netlbl_audit *audit_info) 
		ret_val = -ENOENT;

		goto doi_remove_return;

	}

	if (!refcount_dec_and_test(&doi_def->refcount)) {

		spin_unlock(&calipso_doi_list_lock);

		ret_val = -EBUSY;

		goto doi_remove_return;

	}

	list_del_rcu(&doi_def->list);

	spin_unlock(&calipso_doi_list_lock);



	call_rcu(&doi_def->rcu, calipso_doi_free_rcu);

	calipso_doi_putdef(doi_def);

	ret_val = 0;



doi_remove_return:
@@ -522,10 +520,8 @@ static void calipso_doi_putdef(struct calipso_doi *doi_def) 


	if (!refcount_dec_and_test(&doi_def->refcount))

		return;

	spin_lock(&calipso_doi_list_lock);

	list_del_rcu(&doi_def->list);

	spin_unlock(&calipso_doi_list_lock);



	calipso_cache_invalidate();

	call_rcu(&doi_def->rcu, calipso_doi_free_rcu);

}

net/netlabel/netlabel_cipso_v4.c

+3 −0
Original line number Diff line number Diff line
@@ -581,6 +581,7 @@ static int netlbl_cipsov4_list(struct sk_buff *skb, struct genl_info *info) 


		break;

	}

	cipso_v4_doi_putdef(doi_def);

	rcu_read_unlock();



	genlmsg_end(ans_skb, data);
@@ -589,12 +590,14 @@ static int netlbl_cipsov4_list(struct sk_buff *skb, struct genl_info *info) 
list_retry:

	/* XXX - this limit is a guesstimate */

	if (nlsze_mult < 4) {

		cipso_v4_doi_putdef(doi_def);

		rcu_read_unlock();

		kfree_skb(ans_skb);

		nlsze_mult *= 2;

		goto list_start;

	}

list_failure_lock:

	cipso_v4_doi_putdef(doi_def);

	rcu_read_unlock();

list_failure:

	kfree_skb(ans_skb);