Related: #1188498 - fixup the previous commit
... pushed too early by mistake
This commit is contained in:
parent
5fb1704fa9
commit
619ad1aa6f
|
@ -1,18 +1,22 @@
|
|||
From 8ec378f9a0211e98179a8230da2eda20782d0a11 Mon Sep 17 00:00:00 2001
|
||||
From bf4d8abd7ae3624a13967275dcbaea19f6b6ceb5 Mon Sep 17 00:00:00 2001
|
||||
From: Kamil Dudka <kdudka@redhat.com>
|
||||
Date: Wed, 11 Feb 2015 13:48:12 +0100
|
||||
Subject: [PATCH] fts: fix a crash triggered by recursive bind mount
|
||||
Subject: [PATCH] fts: avoid crash when a cycle is added while traversing
|
||||
|
||||
This could be triggered by auto-mounting a recursive bind mount.
|
||||
Reported by Michael Chapman in: https://bugzilla.redhat.com/1188498
|
||||
* lib/fts.c (fts_read): Avoid removing the original hash table item
|
||||
when leaving a directory that caused a cycle, and preserve the FTS_DC
|
||||
flag.
|
||||
|
||||
Bug: https://bugzilla.redhat.com/1188498
|
||||
Bug: http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/34867
|
||||
---
|
||||
gl/lib/fts.c | 13 ++++++++++---
|
||||
1 file changed, 10 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/gl/lib/fts.c b/gl/lib/fts.c
|
||||
index 9c38c4f..9b97fe3 100644
|
||||
index 500e92c..f76c015 100644
|
||||
--- a/gl/lib/fts.c
|
||||
+++ b/gl/lib/fts.c
|
||||
@@ -1091,9 +1091,16 @@ cd_dot_dot:
|
|
@ -11,7 +11,8 @@ Source0: ftp://alpha.gnu.org/gnu/findutils/%{name}-%{version}.tar.gz
|
|||
# do not build locate
|
||||
Patch1: findutils-4.4.0-no-locate.patch
|
||||
|
||||
Patch2: findutils-4.5.12-fts-cycle.patch
|
||||
# fix a crash triggered by recursive bind mount (#1188498)
|
||||
Patch2: findutils-4.5.14-fts-cycle.patch
|
||||
|
||||
# add a new option -xautofs to find to not descend into directories on autofs
|
||||
# file systems
|
||||
|
@ -103,6 +104,9 @@ fi
|
|||
%{_infodir}/find-maint.info.gz
|
||||
|
||||
%changelog
|
||||
* Mon Feb 16 2015 Kamil Dudka <kdudka@redhat.com> - 1:4.5.12-8
|
||||
- fix a crash triggered by recursive bind mount (#1188498)
|
||||
|
||||
* Sat Aug 16 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:4.5.12-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
|
||||
|
||||
|
|
Loading…
Reference in New Issue