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

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

[CIPSO]: remove duplicated code in the cipso_v4_*_getattr() functions 



The bulk of the CIPSO option parsing/processing in the cipso_v4_sock_getattr()
and cipso_v4_skb_getattr() functions are identical, the only real difference
being where the functions obtain the CIPSO option itself.  This patch creates
a new function, cipso_v4_getattr(), which contains the common CIPSO option
parsing/processing code and modifies the existing functions to call this new
helper function.

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

net/ipv4/cipso_ipv4.c

+42 −73
Original line number Original line Diff line number Diff line
@@ -1831,67 +1831,74 @@ int cipso_v4_sock_setattr(struct sock *sk, 
}

}





/**

/**

 * cipso_v4_sock_getattr - Get the security attributes from a sock

 * cipso_v4_getattr - Helper function for the cipso_v4_*_getattr functions

 * @sk: the sock

 * @cipso: the CIPSO v4 option

 * @secattr: the security attributes

 * @secattr: the security attributes

 *

 *

 * Description:

 * Description:

 * Query @sk to see if there is a CIPSO option attached to the sock and if

 * Inspect @cipso and return the security attributes in @secattr.  Returns zero

 * there is return the CIPSO security attributes in @secattr.  This function

 * on success and negative values on failure.

 * requires that @sk be locked, or privately held, but it does not do any

 * locking itself.  Returns zero on success and negative values on failure.

 *

 *

 */

 */

int cipso_v4_sock_getattr(struct sock *sk, struct netlbl_lsm_secattr *secattr)

static int cipso_v4_getattr(const unsigned char *cipso,

			    struct netlbl_lsm_secattr *secattr)

{

{

	int ret_val = -ENOMSG;

	int ret_val = -ENOMSG;

	struct inet_sock *sk_inet;

	unsigned char *cipso_ptr;

	u32 doi;

	u32 doi;

	struct cipso_v4_doi *doi_def;

	struct cipso_v4_doi *doi_def;





	sk_inet = inet_sk(sk);

	if (cipso_v4_cache_check(cipso, cipso[1], secattr) == 0)

	if (sk_inet->opt == NULL || sk_inet->opt->cipso == 0)

		return 0;

		return -ENOMSG;

	cipso_ptr = sk_inet->opt->__data + sk_inet->opt->cipso -

		sizeof(struct iphdr);

	ret_val = cipso_v4_cache_check(cipso_ptr, cipso_ptr[1], secattr);

	if (ret_val == 0)

		return ret_val;





	doi = ntohl(get_unaligned((__be32 *)&cipso_ptr[2]));

	doi = ntohl(get_unaligned((__be32 *)&cipso[2]));

	rcu_read_lock();

	rcu_read_lock();

	doi_def = cipso_v4_doi_search(doi);

	doi_def = cipso_v4_doi_search(doi);

	if (doi_def == NULL) {

	if (doi_def == NULL)

		rcu_read_unlock();

		goto getattr_return;

		return -ENOMSG;

	}



	/* XXX - This code assumes only one tag per CIPSO option which isn't

	/* XXX - This code assumes only one tag per CIPSO option which isn't

	 * really a good assumption to make but since we only support the MAC

	 * really a good assumption to make but since we only support the MAC

	 * tags right now it is a safe assumption. */

	 * tags right now it is a safe assumption. */

	switch (cipso_ptr[6]) {

	switch (cipso[6]) {

	case CIPSO_V4_TAG_RBITMAP:

	case CIPSO_V4_TAG_RBITMAP:

		ret_val = cipso_v4_parsetag_rbm(doi_def,

		ret_val = cipso_v4_parsetag_rbm(doi_def, &cipso[6], secattr);

						&cipso_ptr[6],

						secattr);

		break;

		break;

	case CIPSO_V4_TAG_ENUM:

	case CIPSO_V4_TAG_ENUM:

		ret_val = cipso_v4_parsetag_enum(doi_def,

		ret_val = cipso_v4_parsetag_enum(doi_def, &cipso[6], secattr);

						 &cipso_ptr[6],

						 secattr);

		break;

		break;

	case CIPSO_V4_TAG_RANGE:

	case CIPSO_V4_TAG_RANGE:

		ret_val = cipso_v4_parsetag_rng(doi_def,

		ret_val = cipso_v4_parsetag_rng(doi_def, &cipso[6], secattr);

						&cipso_ptr[6],

						secattr);

		break;

		break;

	}

	}

	rcu_read_unlock();





getattr_return:

	rcu_read_unlock();

	return ret_val;

	return ret_val;

}

}





/**

 * cipso_v4_sock_getattr - Get the security attributes from a sock

 * @sk: the sock

 * @secattr: the security attributes

 *

 * Description:

 * Query @sk to see if there is a CIPSO option attached to the sock and if

 * there is return the CIPSO security attributes in @secattr.  This function

 * requires that @sk be locked, or privately held, but it does not do any

 * locking itself.  Returns zero on success and negative values on failure.

 *

 */

int cipso_v4_sock_getattr(struct sock *sk, struct netlbl_lsm_secattr *secattr)

{

	struct ip_options *opt;



	opt = inet_sk(sk)->opt;

	if (opt == NULL || opt->cipso == 0)

		return -ENOMSG;



	return cipso_v4_getattr(opt->__data + opt->cipso - sizeof(struct iphdr),

				secattr);

}



/**

/**

 * cipso_v4_skbuff_getattr - Get the security attributes from the CIPSO option

 * cipso_v4_skbuff_getattr - Get the security attributes from the CIPSO option

 * @skb: the packet

 * @skb: the packet
@@ -1905,45 +1912,7 @@ int cipso_v4_sock_getattr(struct sock *sk, struct netlbl_lsm_secattr *secattr) 
int cipso_v4_skbuff_getattr(const struct sk_buff *skb,

int cipso_v4_skbuff_getattr(const struct sk_buff *skb,

			    struct netlbl_lsm_secattr *secattr)

			    struct netlbl_lsm_secattr *secattr)

{

{

	int ret_val = -ENOMSG;

	return cipso_v4_getattr(CIPSO_V4_OPTPTR(skb), secattr);

	unsigned char *cipso_ptr;

	u32 doi;

	struct cipso_v4_doi *doi_def;



	cipso_ptr = CIPSO_V4_OPTPTR(skb);

	if (cipso_v4_cache_check(cipso_ptr, cipso_ptr[1], secattr) == 0)

		return 0;



	doi = ntohl(get_unaligned((__be32 *)&cipso_ptr[2]));

	rcu_read_lock();

	doi_def = cipso_v4_doi_search(doi);

	if (doi_def == NULL)

		goto skbuff_getattr_return;



	/* XXX - This code assumes only one tag per CIPSO option which isn't

	 * really a good assumption to make but since we only support the MAC

	 * tags right now it is a safe assumption. */

	switch (cipso_ptr[6]) {

	case CIPSO_V4_TAG_RBITMAP:

		ret_val = cipso_v4_parsetag_rbm(doi_def,

						&cipso_ptr[6],

						secattr);

		break;

	case CIPSO_V4_TAG_ENUM:

		ret_val = cipso_v4_parsetag_enum(doi_def,

						 &cipso_ptr[6],

						 secattr);

		break;

	case CIPSO_V4_TAG_RANGE:

		ret_val = cipso_v4_parsetag_rng(doi_def,

						&cipso_ptr[6],

						secattr);

		break;

	}



skbuff_getattr_return:

	rcu_read_unlock();

	return ret_val;

}

}





/*

/*