git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.kernel.org:/home/rmk/linux-2.6-arm
[pandora-kernel.git]
/
net
/
socket.c
diff --git
a/net/socket.c
b/net/socket.c
index
01918f7
..
6c9b9b3
100644
(file)
--- a/
net/socket.c
+++ b/
net/socket.c
@@
-825,7
+825,7
@@
static long sock_ioctl(struct file *file, unsigned cmd, unsigned long arg)
break;
case FIOGETOWN:
case SIOCGPGRP:
- err = put_user(
sock->file->f_owner.pid
,
+ err = put_user(
f_getown(sock->file)
,
(int __user *)argp);
break;
case SIOCGIFBR: