[hurd] 04/06: mach-defpager: fix pager leak

[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 f1f098dc682d41a94a2c6c266b136112aab6ea85
Author: Richard Braun <address@hidden>
Date:   Mon Dec 26 22:08:02 2016 +0100

    mach-defpager: fix pager leak
    
    The server code for no-senders notifications wasn't updated to expect
    protected payloads.
    
    * mach-defpager/default_pager.c (default_pager_no_senders): Accept the
    pager structure directly instead of its port name and update body
    accordingly.
    (default_pager_no_senders): Accept protected payloads in addition to
    send-once rights and fetch the pager structure according to the message
    type.
---
 mach-defpager/default_pager.c | 32 ++++++++++++++++++++------------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/mach-defpager/default_pager.c b/mach-defpager/default_pager.c
index cddbcfa..aafa2cf 100644
--- a/mach-defpager/default_pager.c
+++ b/mach-defpager/default_pager.c
@@ -2388,12 +2388,11 @@ ddprintf ("seqnos_memory_object_terminate <%p>: 
pager_port_unlock: <%p>[s:%d,r:%
        return (KERN_SUCCESS);
 }
 
-void default_pager_no_senders(pager, seqno, mscount)
-       memory_object_t pager;
+void default_pager_no_senders(ds, seqno, mscount)
+       default_pager_t ds;
        mach_port_seqno_t seqno;
        mach_port_mscount_t mscount;
 {
-       default_pager_t ds;
        kern_return_t            kr;
        static char              here[] = "%sno_senders";
 
@@ -2406,9 +2405,6 @@ void default_pager_no_senders(pager, seqno, mscount)
         */
 
 
-       ds = begin_using_default_pager(pager);
-       if (ds == DEFAULT_PAGER_NULL)
-               panic(here,my_name);
        pager_port_lock(ds, seqno);
 
        /*
@@ -2435,7 +2431,7 @@ void default_pager_no_senders(pager, seqno, mscount)
        pager_port_list_delete(ds);
        pager_dealloc(&ds->dpager);
 
-       kr = mach_port_mod_refs(default_pager_self, pager,
+       kr = mach_port_mod_refs(default_pager_self, ds->pager,
                                MACH_PORT_RIGHT_RECEIVE, -1);
        if (kr != KERN_SUCCESS)
                panic(here,my_name);
@@ -2784,6 +2780,8 @@ seqnos_memory_object_change_completed(ds, seqno, 
may_cache, copy_strategy)
 boolean_t default_pager_notify_server(in, out)
        mach_msg_header_t *in, *out;
 {
+       default_pager_t ds;
+
        mach_no_senders_notification_t *n =
                        (mach_no_senders_notification_t *) in;
 
@@ -2795,10 +2793,21 @@ boolean_t default_pager_notify_server(in, out)
         *      a genuine no-senders notification from the kernel.
         */
 
-       if ((n->not_header.msgh_bits !=
-                       MACH_MSGH_BITS(0, MACH_MSG_TYPE_PORT_SEND_ONCE)) ||
-           (n->not_header.msgh_id != MACH_NOTIFY_NO_SENDERS))
+       if (n->not_header.msgh_id != MACH_NOTIFY_NO_SENDERS) {
                return FALSE;
+       }
+
+       if (n->not_header.msgh_bits
+           == MACH_MSGH_BITS(0, MACH_MSG_TYPE_PROTECTED_PAYLOAD)) {
+               ds = 
begin_using_default_pager_payload(n->not_header.msgh_protected_payload);
+       } else if (n->not_header.msgh_bits
+                  == MACH_MSGH_BITS(0, MACH_MSG_TYPE_PORT_SEND_ONCE)) {
+               ds = begin_using_default_pager(n->not_header.msgh_local_port);
+       } else {
+               return FALSE;
+       }
+
+       assert(ds != DEFAULT_PAGER_NULL);
 
        assert(n->not_header.msgh_size == sizeof *n);
        assert(n->not_header.msgh_remote_port == MACH_PORT_NULL);
@@ -2809,8 +2818,7 @@ boolean_t default_pager_notify_server(in, out)
        assert(n->not_type.msgt_inline);
        assert(! n->not_type.msgt_longform);
 
-       default_pager_no_senders(n->not_header.msgh_local_port,
-                                n->not_header.msgh_seqno, n->not_count);
+       default_pager_no_senders(ds, n->not_header.msgh_seqno, n->not_count);
 
        out->msgh_remote_port = MACH_PORT_NULL;
        return TRUE;

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