summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormartin <martin@NetBSD.org>2022-04-18 10:54:21 +0000
committermartin <martin@NetBSD.org>2022-04-18 10:54:21 +0000
commitf010d67123fdc38f7fdfb6f5378442b3efc32cf8 (patch)
treefee0a83d082786efaefece315b6808a03cafe86a
parent1856a7eb37884c96ca623dec806a0eee4b0fc338 (diff)
Pull up following revision(s) (requested by reinoud in ticket #1437):
sys/fs/udf/udf_allocation.c: revision 1.46 Revere modification of initializer; it can lead to race conditions where two allocation would pick the `empty' space causing a panic later on.
-rw-r--r--sys/fs/udf/udf_allocation.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/fs/udf/udf_allocation.c b/sys/fs/udf/udf_allocation.c
index ade2b9dbac5..69641053394 100644
--- a/sys/fs/udf/udf_allocation.c
+++ b/sys/fs/udf/udf_allocation.c
@@ -1,4 +1,4 @@
-/* $NetBSD: udf_allocation.c,v 1.40.4.1 2022/03/13 09:48:32 martin Exp $ */
+/* $NetBSD: udf_allocation.c,v 1.40.4.2 2022/04/18 10:54:21 martin Exp $ */
/*
* Copyright (c) 2006, 2008 Reinoud Zandijk
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__KERNEL_RCSID(0, "$NetBSD: udf_allocation.c,v 1.40.4.1 2022/03/13 09:48:32 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udf_allocation.c,v 1.40.4.2 2022/04/18 10:54:21 martin Exp $");
#endif /* not lint */
@@ -863,8 +863,8 @@ udf_search_free_vatloc(struct udf_mount *ump, uint32_t *lbnumres)
ump->vat_entries++;
}
- /* mark entry with initialiser just in case */
- lb_map = udf_rw32(0xffffffff);
+ /* mark entry with non free-space initialiser just in case */
+ lb_map = udf_rw32(0xfffffffe);
udf_vat_write(ump->vat_node, (uint8_t *) &lb_map, 4,
ump->vat_offset + lb_num *4);
ump->vat_last_free_lb = lb_num;