Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-18 03:06:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
David S. Miller 2008-10-30 23:57:40 -07:00
commit e5e7ad44d0
4 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
net/ipv4/cipso_ipv4.c
View File

@ -2063,9 +2063,10 @@ int cipso_v4_skbuff_setattr(struct sk_buff *skb,
u32 opt_len; u32 opt_len;
int len_delta; int len_delta;
buf_len = cipso_v4_genopt(buf, buf_len, doi_def, secattr); ret_val = cipso_v4_genopt(buf, buf_len, doi_def, secattr);
if (buf_len < 0) if (ret_val < 0)
return buf_len; return ret_val;
buf_len = ret_val;
opt_len = (buf_len + 3) & ~3; opt_len = (buf_len + 3) & ~3;
/* we overwrite any existing options to ensure that we have enough /* we overwrite any existing options to ensure that we have enough

2
net/netlabel/netlabel_addrlist.c
View File

@ -315,6 +315,7 @@ struct netlbl_af6list *netlbl_af6list_remove(const struct in6_addr *addr,
* Audit Helper Functions * Audit Helper Functions
*/ */
#ifdef CONFIG_AUDIT
/** /**
* netlbl_af4list_audit_addr - Audit an IPv4 address * netlbl_af4list_audit_addr - Audit an IPv4 address
* @audit_buf: audit buffer * @audit_buf: audit buffer
@ -386,3 +387,4 @@ void netlbl_af6list_audit_addr(struct audit_buffer *audit_buf,
} }
} }
#endif /* IPv6 */ #endif /* IPv6 */
#endif /* CONFIG_AUDIT */

22
net/netlabel/netlabel_addrlist.h
View File

@ -120,9 +120,19 @@ struct netlbl_af4list *netlbl_af4list_search(__be32 addr,
struct netlbl_af4list *netlbl_af4list_search_exact(__be32 addr, struct netlbl_af4list *netlbl_af4list_search_exact(__be32 addr,
__be32 mask, __be32 mask,
struct list_head *head); struct list_head *head);
#ifdef CONFIG_AUDIT
void netlbl_af4list_audit_addr(struct audit_buffer *audit_buf, void netlbl_af4list_audit_addr(struct audit_buffer *audit_buf,
int src, const char *dev, int src, const char *dev,
__be32 addr, __be32 mask); __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) #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, struct netlbl_af6list *netlbl_af6list_search_exact(const struct in6_addr *addr,
const struct in6_addr *mask, const struct in6_addr *mask,
struct list_head *head); struct list_head *head);
#ifdef CONFIG_AUDIT
void netlbl_af6list_audit_addr(struct audit_buffer *audit_buf, void netlbl_af6list_audit_addr(struct audit_buffer *audit_buf,
int src, int src,
const char *dev, const char *dev,
const struct in6_addr *addr, const struct in6_addr *addr,
const struct in6_addr *mask); 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 /* IPV6 */
#endif #endif

2
net/netlabel/netlabel_mgmt.c
View File

@ -265,7 +265,7 @@ add_failure:
static int netlbl_mgmt_listentry(struct sk_buff *skb, static int netlbl_mgmt_listentry(struct sk_buff *skb,
struct netlbl_dom_map *entry) struct netlbl_dom_map *entry)
{ {
int ret_val; int ret_val = 0;
struct nlattr *nla_a; struct nlattr *nla_a;
struct nlattr *nla_b; struct nlattr *nla_b;
struct netlbl_af4list *iter4; struct netlbl_af4list *iter4;