lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge with /shiny/git/linux-2.6/.git

Browse Source
This commit is contained in:
David Woodhouse
2005-08-09 16:51:35 +01:00
parent c5fbc3966f 00dd1e4339
commit c973b112c7
1115 changed files with 89061 additions and 12338 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
security/selinux/hooks.c
View File

@@ -826,7 +826,8 @@ static int inode_doinit_with_dentry(struct inode *inode, struct dentry *opt_dent
sid = sbsec->def_sid;
rc = 0;
} else {
rc = security_context_to_sid(context, rc, &sid);
rc = security_context_to_sid_default(context, rc, &sid,
sbsec->def_sid);
if (rc) {
printk(KERN_WARNING "%s: context_to_sid(%s) "
"returned %d for dev=%s ino=%ld\n",
@@ -3125,12 +3126,12 @@ static int selinux_socket_connect(struct socket *sock, struct sockaddr *address,
if (sk->sk_family == PF_INET) {
addr4 = (struct sockaddr_in *)address;
if (addrlen != sizeof(struct sockaddr_in))
if (addrlen < sizeof(struct sockaddr_in))
return -EINVAL;
snum = ntohs(addr4->sin_port);
} else {
addr6 = (struct sockaddr_in6 *)address;
if (addrlen != sizeof(struct sockaddr_in6))
if (addrlen < SIN6_LEN_RFC2133)
return -EINVAL;
snum = ntohs(addr6->sin6_port);
}