aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPavel Emelyanov <xemul@parallels.com>2011-12-15 02:45:58 +0000
committerDavid S. Miller <davem@davemloft.net>2011-12-16 13:48:28 -0500
commitac02be8d96af9f66a4de86781ee9facc2dff99d4 (patch)
treef9a7ef71f50d5bda679f8603cbfa53c0d4092df4
parent5f7b0569460b7d8d01ca776430a00505a68b7584 (diff)
downloadlinux-stericsson-ac02be8d96af9f66a4de86781ee9facc2dff99d4.tar.gz
unix_diag: Unix peer inode NLA
Report the peer socket inode ID as NLA. With this it's finally possible to find out the other end of an interesting unix connection. Signed-off-by: Pavel Emelyanov <xemul@parallels.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--include/linux/unix_diag.h2
-rw-r--r--net/unix/diag.c24
2 files changed, 26 insertions, 0 deletions
diff --git a/include/linux/unix_diag.h b/include/linux/unix_diag.h
index 3e53adbe9c7f..2d74a86024ac 100644
--- a/include/linux/unix_diag.h
+++ b/include/linux/unix_diag.h
@@ -13,6 +13,7 @@ struct unix_diag_req {
#define UDIAG_SHOW_NAME 0x00000001 /* show name (not path) */
#define UDIAG_SHOW_VFS 0x00000002 /* show VFS inode info */
+#define UDIAG_SHOW_PEER 0x00000004 /* show peer socket info */
struct unix_diag_msg {
__u8 udiag_family;
@@ -27,6 +28,7 @@ struct unix_diag_msg {
enum {
UNIX_DIAG_NAME,
UNIX_DIAG_VFS,
+ UNIX_DIAG_PEER,
UNIX_DIAG_MAX,
};
diff --git a/net/unix/diag.c b/net/unix/diag.c
index 83799ef19b49..0e0fda786afe 100644
--- a/net/unix/diag.c
+++ b/net/unix/diag.c
@@ -43,6 +43,26 @@ rtattr_failure:
return -EMSGSIZE;
}
+static int sk_diag_dump_peer(struct sock *sk, struct sk_buff *nlskb)
+{
+ struct sock *peer;
+ int ino;
+
+ peer = unix_peer_get(sk);
+ if (peer) {
+ unix_state_lock(peer);
+ ino = sock_i_ino(peer);
+ unix_state_unlock(peer);
+ sock_put(peer);
+
+ RTA_PUT_U32(nlskb, UNIX_DIAG_PEER, ino);
+ }
+
+ return 0;
+rtattr_failure:
+ return -EMSGSIZE;
+}
+
static int sk_diag_fill(struct sock *sk, struct sk_buff *skb, struct unix_diag_req *req,
u32 pid, u32 seq, u32 flags, int sk_ino)
{
@@ -69,6 +89,10 @@ static int sk_diag_fill(struct sock *sk, struct sk_buff *skb, struct unix_diag_r
sk_diag_dump_vfs(sk, skb))
goto nlmsg_failure;
+ if ((req->udiag_show & UDIAG_SHOW_PEER) &&
+ sk_diag_dump_peer(sk, skb))
+ goto nlmsg_failure;
+
nlh->nlmsg_len = skb_tail_pointer(skb) - b;
return skb->len;