summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/patches/fix-rename0001-XXX-libdiskfs-fix-renaming-of-directories.patch28
-rw-r--r--debian/patches/series1
2 files changed, 29 insertions, 0 deletions
diff --git a/debian/patches/fix-rename0001-XXX-libdiskfs-fix-renaming-of-directories.patch b/debian/patches/fix-rename0001-XXX-libdiskfs-fix-renaming-of-directories.patch
new file mode 100644
index 00000000..c7ea6cb0
--- /dev/null
+++ b/debian/patches/fix-rename0001-XXX-libdiskfs-fix-renaming-of-directories.patch
@@ -0,0 +1,28 @@
+From 4e4ef710b29273458d3d5db9f98313b95a1fc0c2 Mon Sep 17 00:00:00 2001
+From: Justus Winter <4winter@informatik.uni-hamburg.de>
+Date: Tue, 19 May 2015 18:12:20 +0200
+Subject: [PATCH hurd] XXX libdiskfs: fix renaming of directories
+
+XXX
+
+* libdiskfs/dir-renamed.c (diskfs_rename_dir): Fix error handling.
+---
+ libdiskfs/dir-renamed.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/libdiskfs/dir-renamed.c b/libdiskfs/dir-renamed.c
+index 9e37e23..aceb222 100644
+--- a/libdiskfs/dir-renamed.c
++++ b/libdiskfs/dir-renamed.c
+@@ -94,6 +94,8 @@ diskfs_rename_dir (struct node *fdp, struct node *fnp, const char *fromname,
+ ds = buf;
+ err = diskfs_lookup (tdp, toname, RENAME, &tnp, ds, tocred);
+ assert (err != EAGAIN); /* <-> assert (TONAME != "..") */
++ if (err)
++ goto out;
+
+ if (tnp == fnp)
+ {
+--
+2.1.4
+
diff --git a/debian/patches/series b/debian/patches/series
index dbf6a3d9..517ad90a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -63,3 +63,4 @@ bootshell0007-XXX-bootshell.patch
bootshell0008-XXX-proc-fix-build.patch
bootshell0009-fixup-more-error-handling.patch
bootshell0010-pull-code-from-livecd-XXX-document.patch
+fix-rename0001-XXX-libdiskfs-fix-renaming-of-directories.patch