From 918d4d716343a54ce97aefb13d20fa8f4e1d03de Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Thu, 10 May 2012 15:52:43 -0700 Subject: Hurd: Fix port deallocation on mknod error. --- sysdeps/mach/hurd/xmknodat.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'sysdeps') diff --git a/sysdeps/mach/hurd/xmknodat.c b/sysdeps/mach/hurd/xmknodat.c index acd1a8c683..645f222809 100644 --- a/sysdeps/mach/hurd/xmknodat.c +++ b/sysdeps/mach/hurd/xmknodat.c @@ -1,6 +1,5 @@ /* Create a device file relative to an open directory. Hurd version. - Copyright (C) 1991,1992,1993,1994,1995,1996,1999,2002,2005,2006 - Free Software Foundation, Inc. + Copyright (C) 1991-2012 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -34,7 +33,7 @@ int __xmknodat (int vers, int fd, const char *path, mode_t mode, dev_t *dev) { - error_t err; + error_t errnode, err; file_t dir, node; char *name; char buf[100], *bp; @@ -94,7 +93,7 @@ __xmknodat (int vers, int fd, const char *path, mode_t mode, dev_t *dev) return -1; /* Create a new, unlinked node in the target directory. */ - err = __dir_mkfile (dir, O_WRITE, (mode & ~S_IFMT) & ~_hurd_umask, &node); + errnode = err = __dir_mkfile (dir, O_WRITE, (mode & ~S_IFMT) & ~_hurd_umask, &node); if (! err && translator != NULL) /* Set the node's translator to make it a device. */ @@ -109,7 +108,8 @@ __xmknodat (int vers, int fd, const char *path, mode_t mode, dev_t *dev) err = __dir_link (dir, node, name, 1); __mach_port_deallocate (__mach_task_self (), dir); - __mach_port_deallocate (__mach_task_self (), node); + if (! errnode) + __mach_port_deallocate (__mach_task_self (), node); if (err) return __hurd_fail (err); -- cgit 1.4.1