--- zzzz-none-000/linux-2.6.19.2/security/selinux/hooks.c	2007-01-10 19:10:37.000000000 +0000
+++ davinci-8020-5505/linux-2.6.19.2/security/selinux/hooks.c	2007-01-11 07:38:19.000000000 +0000
@@ -1754,8 +1754,7 @@
 						get_file(devnull);
 					} else {
 						devnull = dentry_open(dget(selinux_null), mntget(selinuxfs_mount), O_RDWR);
-						if (IS_ERR(devnull)) {
-							devnull = NULL;
+						if (!devnull) {
 							put_unused_fd(fd);
 							fput(file);
 							continue;
@@ -3314,13 +3313,7 @@
 
 static int selinux_socket_setsockopt(struct socket *sock,int level,int optname)
 {
-	int err;
-
-	err = socket_has_perm(current, sock, SOCKET__SETOPT);
-	if (err)
-		return err;
-
-	return selinux_netlbl_socket_setsockopt(sock, level, optname);
+	return socket_has_perm(current, sock, SOCKET__SETOPT);
 }
 
 static int selinux_socket_getsockopt(struct socket *sock, int level,