Skip to contentSkip to conversation

selinux: fix problems in netnode when BUG() is compiled out

PATCH Superseded Paul Moore 1 participant 2 messages Dec 5, 2012 SELinux security module

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Paul Moore

author
#0 lore raw

PATCH 1/1 selinux: fix problems in netnode when BUG() is compiled out

When the BUG() macro is disabled at compile time it can cause some problems in the SELinux netnode code: invalid return codes and uninitialized variables. This patch fixes this by making sure we take some corrective action after the BUG() macro.

---
 security/selinux/netnode.c |    3 +++
 1 file changed, 3 insertions(+)
security/selinux/netnode.c +3 -0
index c5454c0..9e0048a 100644
@@ -166,6 +166,7 @@ static void sel_netnode_insert(struct sel_netnode *node)
 		break;
 	default:
 		BUG();
+		return;
 	}
 
 	/* we need to impose a limit on the growth of the hash table so check
@@ -225,6 +226,8 @@ static int sel_netnode_sid_slow(void *addr, u16 family, u32 *sid)
 		break;
 	default:
 		BUG();
+		ret = -EINVAL;
+		goto out;
 	}
 	if (ret != 0)
 		goto out;

--
This message was distributed to subscribers of the selinux mailing list. If you no longer wish to subscribe, send mail to [email protected] with the words "unsubscribe selinux" without quotes as the message.

author
#1 lore raw
Quoted 24 lines · Paul Moore

When the BUG() macro is disabled at compile time it can cause some problems in the SELinux netnode code: invalid return codes and uninitialized variables. This patch fixes this by making sure we take some corrective action after the BUG() macro.

---
 security/selinux/netnode.c |    3 +++
 1 file changed, 3 insertions(+)
security/selinux/netnode.c +1 -0
index c5454c0..9e0048a 100644
@@ -166,6 +166,7 @@ static void sel_netnode_insert(struct sel_netnode *node)
 break;
 	default:
 		BUG();
+		return;
 	}
 
 	/* we need to impose a limit on the growth of the hash table so check

security/selinux/netnode.c static int sel_netnode_sid_slow(void *addr, u16 family, · line 233

Quoted 8 lines
security/selinux/netnode.c +2 -0
@@ -225,6 +226,8 @@ static int sel_netnode_sid_slow(void *addr, u16 family,
 u32 *sid) break;
 	default:
 		BUG();
+		ret = -EINVAL;
+		goto out;
 	}
 	if (ret != 0)
 		goto out;

Ooops, scratch this patch.

Signature · 8 lines
paul moore
security and virtualization @ redhat


--
This message was distributed to subscribers of the selinux mailing list.
If you no longer wish to subscribe, send mail to [email protected] with
the words "unsubscribe selinux" without quotes as the message.