diff options
author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2010-08-01 12:43:52 +0200 |
---|---|---|
committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2010-08-01 12:45:12 +0200 |
commit | 2785afe572b463d578e023c6d4668aae888e09a5 (patch) | |
tree | 995dfb2f576d9c40d59d422f48127e25f1ef2cd3 /debian/patches/libdiskfs-rename.patch | |
parent | 9de2a32ced4076497e26ebfcffbd8c3ec260699b (diff) |
New upstream 20100701 snapshot.
- debian/patches/dir_acces_fix.patch: Remove patch, merged upstream.
- debian/patches/exec_fix.patch: Likewise.
- debian/patches/libdiskfs-rename.patch: Likewise.
- debian/patches/libpthread_mutex_owner.patch: Likewise.
- debian/patches/libpthread_recursive_mutex_initializer.patch: Likewise.
- debian/patches/libpthread_setcancel.patch: Likewise.
- debian/patches/pfinet-gcc-4.3-fix.patch: Likewise.
- debian/patches/procfs.patch: Likewise.
- debian/patches/libpthread_cancel_init.patch: Likewise
- debian/patches/libpthread_kill_0.patch: Likewise
- debian/patches/console_current_vcs.patch: Likewise
- debian/patches/hurd_console_startup.patch: Likewise
- debian/patches/MAKEDEV.patch: Likewise
- debian/patches/tmpfs.patch: Likewise
- debian/patches/libpthread_procfs.patch: New patch, to enable libpthread
and procfs build.
Diffstat (limited to 'debian/patches/libdiskfs-rename.patch')
-rw-r--r-- | debian/patches/libdiskfs-rename.patch | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/debian/patches/libdiskfs-rename.patch b/debian/patches/libdiskfs-rename.patch deleted file mode 100644 index 2809e562..00000000 --- a/debian/patches/libdiskfs-rename.patch +++ /dev/null @@ -1,27 +0,0 @@ -Avoid a mutex deadlock by simply preventing '.' or '..' in source or target -operands. ---- - libdiskfs/dir-rename.c | 5 +++++ - 1 file changed, 5 insertions(+) - ---- a/libdiskfs/dir-rename.c -+++ b/libdiskfs/dir-rename.c -@@ -19,6 +19,7 @@ - - #include "priv.h" - #include "fs_S.h" -+#include <string.h> - - /* To avoid races in checkpath, and to prevent a directory from being - simultaneously renamed by two processes, we serialize all renames of -@@ -44,6 +45,10 @@ diskfs_S_dir_rename (struct protid *from - if (! tocred) - return EXDEV; - -+ if (!strcmp (fromname, ".") || !strcmp (fromname, "..") -+ || !strcmp (toname, ".") || !strcmp (toname, "..")) -+ return EINVAL; -+ - if (tocred->po->shadow_root != fromcred->po->shadow_root) - /* Same translator, but in different shadow trees. */ - return EXDEV; |