upgrade to fedora-2.6.12-1.1398.FC4 + vserver 2.0.rc7

[linux-2.6.git] / net / ipv4 / tcp_diag.c

diff --git a/net/ipv4/tcp_diag.c b/net/ipv4/tcp_diag.c
index 8faa894..40d72bc 100644 (file)
--- a/net/ipv4/tcp_diag.c
+++ b/net/ipv4/tcp_diag.c
@@ -611,6 +611,9 @@ static int tcpdiag_dump(struct sk_buff *skb, struct netlink_callback *cb)
                        sk_for_each(sk, node, &tcp_listening_hash[i]) {
                                struct inet_sock *inet = inet_sk(sk);
 
+                               if (!vx_check(sk->sk_xid, VX_IDENT|VX_WATCH))
+                                       continue;
+
                                if (num < s_num) {
                                        num++;
                                        continue;
@@ -672,6 +675,8 @@ skip_listen_ht:
                sk_for_each(sk, node, &head->chain) {
                        struct inet_sock *inet = inet_sk(sk);
 
+                       if (!vx_check(sk->sk_xid, VX_IDENT|VX_WATCH))
+                               continue;
                        if (num < s_num)
                                goto next_normal;
                        if (!(r->tcpdiag_states & (1 << sk->sk_state)))
@@ -694,6 +699,8 @@ next_normal:
                                    &tcp_ehash[i + tcp_ehash_size].chain) {
                                struct inet_sock *inet = inet_sk(sk);
 
+                               if (!vx_check(sk->sk_xid, VX_IDENT|VX_WATCH))
+                                       continue;
                                if (num < s_num)
                                        goto next_dying;
                                if (r->id.tcpdiag_sport != inet->sport &&