aboutsummaryrefslogtreecommitdiff
path: root/net/packet/diag.c
diff options
context:
space:
mode:
authorNicolas Dichtel <nicolas.dichtel@6wind.com>2013-04-25 06:53:53 +0000
committerDavid S. Miller <davem@davemloft.net>2013-04-29 13:21:30 -0400
commit76d0eeb1a1579453cfd7c4da22004d4b34187ab4 (patch)
tree86deb897a9bf6fe95b72634a7d413abbd1780629 /net/packet/diag.c
parent626419038a3e4a1f61119a4af08d01415961eb4e (diff)
downloadlinux-76d0eeb1a1579453cfd7c4da22004d4b34187ab4.tar.gz
packet_diag: disclose meminfo values
sk_rmem_alloc is disclosed via /proc/net/packet but not via netlink messages. The goal is to have the same level of information. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/packet/diag.c')
-rw-r--r--net/packet/diag.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/net/packet/diag.c b/net/packet/diag.c
index 04c8219a2d0..822fe9b33a4 100644
--- a/net/packet/diag.c
+++ b/net/packet/diag.c
@@ -166,6 +166,10 @@ static int sk_diag_fill(struct sock *sk, struct sk_buff *skb,
pdiag_put_fanout(po, skb))
goto out_nlmsg_trim;
+ if ((req->pdiag_show & PACKET_SHOW_MEMINFO) &&
+ sock_diag_put_meminfo(sk, skb, PACKET_DIAG_MEMINFO))
+ goto out_nlmsg_trim;
+
return nlmsg_end(skb, nlh);
out_nlmsg_trim: