Signed-off-by: Paolo 'Blaisorblade' Giarrusso <[EMAIL PROTECTED]>
---

 linux-2.6.11-paolo/arch/um/drivers/slip_user.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletion(-)

diff -puN arch/um/drivers/slip_user.c~uml-uml_net-security-fix 
arch/um/drivers/slip_user.c
--- linux-2.6.11/arch/um/drivers/slip_user.c~uml-uml_net-security-fix   
2005-03-09 12:44:10.000000000 +0100
+++ linux-2.6.11-paolo/arch/um/drivers/slip_user.c      2005-03-09 
12:44:10.000000000 +0100
@@ -108,6 +108,9 @@ static int slip_tramp(char **argv, int f
                        err = -EINVAL;
                }
        }
+
+       os_close_file(fds[0]);
+
        return(err);
 }
 
@@ -128,6 +131,7 @@ static int slip_open(void *data)
        sfd = os_open_file(ptsname(mfd), of_rdwr(OPENFLAGS()), 0);
        if(sfd < 0){
                printk("Couldn't open tty for slip line, err = %d\n", -sfd);
+               os_close_file(mfd);
                return(sfd);
        }
        if(set_up_tty(sfd)) return(-1);
@@ -175,7 +179,7 @@ static void slip_close(int fd, void *dat
 
        sprintf(version_buf, "%d", UML_NET_VERSION);
 
-       err = slip_tramp(argv, -1);
+       err = slip_tramp(argv, pri->slave);
 
        if(err != 0)
                printk("slip_tramp failed - errno = %d\n", -err);
_
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to