Commit 96784de5 authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'stable-3.17' of git://git.infradead.org/users/pcmoore/selinux

Pull SElinux fixes from Paul Moore:
 "Two small patches to fix a couple of build warnings in SELinux and
  NetLabel.  The patches are obvious enough that I don't think any
  additional explanation is necessary, but it basically boils down to
  the usual: I was stupid, and these patches fix some of the stupid.

  Both patches were posted earlier this week to the SELinux list, and
  that is where they sat as I didn't think there were noteworthy enough
  to go upstream at this point in time, but DaveM would rather see them
  upstream now so who am I to argue.  As the patches are both very
  small"

* 'stable-3.17' of git://git.infradead.org/users/pcmoore/selinux:
  selinux: remove unused variabled in the netport, netnode, and netif caches
  netlabel: fix the netlbl_catmap_setlong() dummy function
parents 0d10c2c1 942ba364
...@@ -524,10 +524,10 @@ static inline int netlbl_catmap_setrng(struct netlbl_lsm_catmap **catmap, ...@@ -524,10 +524,10 @@ static inline int netlbl_catmap_setrng(struct netlbl_lsm_catmap **catmap,
{ {
return 0; return 0;
} }
static int netlbl_catmap_setlong(struct netlbl_lsm_catmap **catmap, static inline int netlbl_catmap_setlong(struct netlbl_lsm_catmap **catmap,
u32 offset, u32 offset,
unsigned long bitmap, unsigned long bitmap,
gfp_t flags) gfp_t flags)
{ {
return 0; return 0;
} }
......
...@@ -272,7 +272,7 @@ static struct notifier_block sel_netif_netdev_notifier = { ...@@ -272,7 +272,7 @@ static struct notifier_block sel_netif_netdev_notifier = {
static __init int sel_netif_init(void) static __init int sel_netif_init(void)
{ {
int i, err; int i;
if (!selinux_enabled) if (!selinux_enabled)
return 0; return 0;
...@@ -282,7 +282,7 @@ static __init int sel_netif_init(void) ...@@ -282,7 +282,7 @@ static __init int sel_netif_init(void)
register_netdevice_notifier(&sel_netif_netdev_notifier); register_netdevice_notifier(&sel_netif_netdev_notifier);
return err; return 0;
} }
__initcall(sel_netif_init); __initcall(sel_netif_init);
......
...@@ -303,7 +303,6 @@ void sel_netnode_flush(void) ...@@ -303,7 +303,6 @@ void sel_netnode_flush(void)
static __init int sel_netnode_init(void) static __init int sel_netnode_init(void)
{ {
int iter; int iter;
int ret;
if (!selinux_enabled) if (!selinux_enabled)
return 0; return 0;
...@@ -313,7 +312,7 @@ static __init int sel_netnode_init(void) ...@@ -313,7 +312,7 @@ static __init int sel_netnode_init(void)
sel_netnode_hash[iter].size = 0; sel_netnode_hash[iter].size = 0;
} }
return ret; return 0;
} }
__initcall(sel_netnode_init); __initcall(sel_netnode_init);
...@@ -237,7 +237,6 @@ void sel_netport_flush(void) ...@@ -237,7 +237,6 @@ void sel_netport_flush(void)
static __init int sel_netport_init(void) static __init int sel_netport_init(void)
{ {
int iter; int iter;
int ret;
if (!selinux_enabled) if (!selinux_enabled)
return 0; return 0;
...@@ -247,7 +246,7 @@ static __init int sel_netport_init(void) ...@@ -247,7 +246,7 @@ static __init int sel_netport_init(void)
sel_netport_hash[iter].size = 0; sel_netport_hash[iter].size = 0;
} }
return ret; return 0;
} }
__initcall(sel_netport_init); __initcall(sel_netport_init);
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment