[hurd] 14/26: libdiskfs: fix removal of socket nodes

[Samuel Thibault]

This is an automated email from the git hooks/post-receive script.

sthibault pushed a commit to branch upstream
in repository hurd.

commit 5ab5d98fa515cd19a64e8d5868fcbae85eec9dc5
Author: Richard Braun <address@hidden>
Date:   Fri Oct 18 01:16:08 2013 +0200

    libdiskfs: fix removal of socket nodes
    
    When the file system supports ifsock shortcuts, a socket node can obtain
    a right on a socket address. This reference is only lost if the address
    is destroyed, through a dead-name notification. On the other hand,
    pflocal keeps the address around until all references are dropped. This
    leads to a situation where socket nodes, addresses, and their associated
    sockets are leaked. To remedy the situation, make addresses get a light
    reference on socket nodes, and properly deallocate it when the node is
    destroyed, which will in turn make pflocal correctly remove the matching
    address and socket.
    
    * libdiskfs/ifsock.c (diskfs_S_ifsock_getsockaddr): Add a light reference
    instead of a hard one.
    * libdiskfs/node-nput.c (diskfs_nput): Deallocate right to socket address
    when cleaning light references.
---
 libdiskfs/ifsock.c    |    2 +-
 libdiskfs/node-nput.c |    6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/libdiskfs/ifsock.c b/libdiskfs/ifsock.c
index 9199fdf..01a9b1e 100644
--- a/libdiskfs/ifsock.c
+++ b/libdiskfs/ifsock.c
@@ -121,7 +121,7 @@ diskfs_S_ifsock_getsockaddr (struct protid *cred,
          if (old != MACH_PORT_NULL)
            mach_port_deallocate (mach_task_self (), old);
          np->sockaddr = sockaddr;
-         diskfs_nref (np);
+         diskfs_nref_light (np);
        }
     }      
   
diff --git a/libdiskfs/node-nput.c b/libdiskfs/node-nput.c
index 35f05b5..5043ad1 100644
--- a/libdiskfs/node-nput.c
+++ b/libdiskfs/node-nput.c
@@ -56,6 +56,12 @@ diskfs_nput (struct node *np)
          np->references++;
          pthread_spin_unlock (&diskfs_node_refcnt_lock);
 
+         if (np->sockaddr != MACH_PORT_NULL)
+           {
+             mach_port_deallocate (mach_task_self (), np->sockaddr);
+             np->sockaddr = MACH_PORT_NULL;
+           }
+
          diskfs_try_dropping_softrefs (np);
 
          /* But there's no value in looping forever in this

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-hurd/hurd.git