diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-09 18:09:52 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-09 18:09:52 -0400 |
commit | 96784de59fb35077c2bb33c39328992b836d87d3 (patch) | |
tree | eba46707fce39a89130872c58781630d745e356a /security | |
parent | 0d10c2c170e3384dd63f40216d7af4673d5ebb50 (diff) | |
parent | 942ba3646543aeb3e5729c35d10ac43424bf0b68 (diff) |
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
Diffstat (limited to 'security')
-rw-r--r-- | security/selinux/netif.c | 4 | ||||
-rw-r--r-- | security/selinux/netnode.c | 3 | ||||
-rw-r--r-- | security/selinux/netport.c | 3 |
3 files changed, 4 insertions, 6 deletions
diff --git a/security/selinux/netif.c b/security/selinux/netif.c index 3c3de4ca0ebc..50ce177d71a0 100644 --- a/security/selinux/netif.c +++ b/security/selinux/netif.c | |||
@@ -272,7 +272,7 @@ static struct notifier_block sel_netif_netdev_notifier = { | |||
272 | 272 | ||
273 | static __init int sel_netif_init(void) | 273 | static __init int sel_netif_init(void) |
274 | { | 274 | { |
275 | int i, err; | 275 | int i; |
276 | 276 | ||
277 | if (!selinux_enabled) | 277 | if (!selinux_enabled) |
278 | return 0; | 278 | return 0; |
@@ -282,7 +282,7 @@ static __init int sel_netif_init(void) | |||
282 | 282 | ||
283 | register_netdevice_notifier(&sel_netif_netdev_notifier); | 283 | register_netdevice_notifier(&sel_netif_netdev_notifier); |
284 | 284 | ||
285 | return err; | 285 | return 0; |
286 | } | 286 | } |
287 | 287 | ||
288 | __initcall(sel_netif_init); | 288 | __initcall(sel_netif_init); |
diff --git a/security/selinux/netnode.c b/security/selinux/netnode.c index ddf315260839..da923f89d2a9 100644 --- a/security/selinux/netnode.c +++ b/security/selinux/netnode.c | |||
@@ -303,7 +303,6 @@ void sel_netnode_flush(void) | |||
303 | static __init int sel_netnode_init(void) | 303 | static __init int sel_netnode_init(void) |
304 | { | 304 | { |
305 | int iter; | 305 | int iter; |
306 | int ret; | ||
307 | 306 | ||
308 | if (!selinux_enabled) | 307 | if (!selinux_enabled) |
309 | return 0; | 308 | return 0; |
@@ -313,7 +312,7 @@ static __init int sel_netnode_init(void) | |||
313 | sel_netnode_hash[iter].size = 0; | 312 | sel_netnode_hash[iter].size = 0; |
314 | } | 313 | } |
315 | 314 | ||
316 | return ret; | 315 | return 0; |
317 | } | 316 | } |
318 | 317 | ||
319 | __initcall(sel_netnode_init); | 318 | __initcall(sel_netnode_init); |
diff --git a/security/selinux/netport.c b/security/selinux/netport.c index 73ac6784d091..3311cc393cb4 100644 --- a/security/selinux/netport.c +++ b/security/selinux/netport.c | |||
@@ -237,7 +237,6 @@ void sel_netport_flush(void) | |||
237 | static __init int sel_netport_init(void) | 237 | static __init int sel_netport_init(void) |
238 | { | 238 | { |
239 | int iter; | 239 | int iter; |
240 | int ret; | ||
241 | 240 | ||
242 | if (!selinux_enabled) | 241 | if (!selinux_enabled) |
243 | return 0; | 242 | return 0; |
@@ -247,7 +246,7 @@ static __init int sel_netport_init(void) | |||
247 | sel_netport_hash[iter].size = 0; | 246 | sel_netport_hash[iter].size = 0; |
248 | } | 247 | } |
249 | 248 | ||
250 | return ret; | 249 | return 0; |
251 | } | 250 | } |
252 | 251 | ||
253 | __initcall(sel_netport_init); | 252 | __initcall(sel_netport_init); |