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

Commit e5e7ad44 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'master' of git://git.infradead.org/users/pcmoore/lblnet-2.6

parents 61e57448 47b676c0

net/ipv4/cipso_ipv4.c

+4 −3
Original line number Diff line number Diff line
@@ -2063,9 +2063,10 @@ int cipso_v4_skbuff_setattr(struct sk_buff *skb, 
	u32 opt_len;

	int len_delta;



	buf_len = cipso_v4_genopt(buf, buf_len, doi_def, secattr);

	if (buf_len < 0)

		return buf_len;

	ret_val = cipso_v4_genopt(buf, buf_len, doi_def, secattr);

	if (ret_val < 0)

		return ret_val;

	buf_len = ret_val;

	opt_len = (buf_len + 3) & ~3;



	/* we overwrite any existing options to ensure that we have enough

net/netlabel/netlabel_addrlist.c

+2 −0
Original line number Diff line number Diff line
@@ -315,6 +315,7 @@ struct netlbl_af6list *netlbl_af6list_remove(const struct in6_addr *addr, 
 * Audit Helper Functions

 */



#ifdef CONFIG_AUDIT

/**

 * netlbl_af4list_audit_addr - Audit an IPv4 address

 * @audit_buf: audit buffer
@@ -386,3 +387,4 @@ void netlbl_af6list_audit_addr(struct audit_buffer *audit_buf, 
	}

}

#endif /* IPv6 */

#endif /* CONFIG_AUDIT */

net/netlabel/netlabel_addrlist.h

+22 −0
Original line number Diff line number Diff line
@@ -120,9 +120,19 @@ struct netlbl_af4list *netlbl_af4list_search(__be32 addr, 
struct netlbl_af4list *netlbl_af4list_search_exact(__be32 addr,

						   __be32 mask,

						   struct list_head *head);



#ifdef CONFIG_AUDIT

void netlbl_af4list_audit_addr(struct audit_buffer *audit_buf,

			       int src, const char *dev,

			       __be32 addr, __be32 mask);

#else

static inline void netlbl_af4list_audit_addr(struct audit_buffer *audit_buf,

					     int src, const char *dev,

					     __be32 addr, __be32 mask)

{

	return;

}

#endif



#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
@@ -179,11 +189,23 @@ struct netlbl_af6list *netlbl_af6list_search(const struct in6_addr *addr, 
struct netlbl_af6list *netlbl_af6list_search_exact(const struct in6_addr *addr,

						   const struct in6_addr *mask,

						   struct list_head *head);



#ifdef CONFIG_AUDIT

void netlbl_af6list_audit_addr(struct audit_buffer *audit_buf,

			       int src,

			       const char *dev,

			       const struct in6_addr *addr,

			       const struct in6_addr *mask);

#else

static inline void netlbl_af6list_audit_addr(struct audit_buffer *audit_buf,

					     int src,

					     const char *dev,

					     const struct in6_addr *addr,

					     const struct in6_addr *mask)

{

	return;

}

#endif

#endif /* IPV6 */



#endif

net/netlabel/netlabel_mgmt.c

+1 −1
Original line number Diff line number Diff line
@@ -265,7 +265,7 @@ static int netlbl_mgmt_add_common(struct genl_info *info, 
static int netlbl_mgmt_listentry(struct sk_buff *skb,

				 struct netlbl_dom_map *entry)

{

	int ret_val;

	int ret_val = 0;

	struct nlattr *nla_a;

	struct nlattr *nla_b;

	struct netlbl_af4list *iter4;