48 lines
1.3 KiB
Diff
48 lines
1.3 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Benjamin Marzinski <bmarzins@redhat.com>
|
||
|
|
Date: Wed, 19 Oct 2022 12:57:10 -0500
|
||
|
|
Subject: [PATCH] kpartx: hold device open until partitions have been created
|
||
|
|
|
||
|
|
kpartx was closing the whole device after it read the partition
|
||
|
|
information off it. This allowed a race, where the device could be
|
||
|
|
removed and another one created with the same major:minor, after kpartx
|
||
|
|
read the partition information but before it created the partition
|
||
|
|
devices.
|
||
|
|
|
||
|
|
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
|
||
|
|
Reviewed-by: Martin Wilck <mwilck@suse.com>
|
||
|
|
---
|
||
|
|
kpartx/kpartx.c | 11 +++--------
|
||
|
|
1 file changed, 3 insertions(+), 8 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/kpartx/kpartx.c b/kpartx/kpartx.c
|
||
|
|
index a337a07b..e62b764f 100644
|
||
|
|
--- a/kpartx/kpartx.c
|
||
|
|
+++ b/kpartx/kpartx.c
|
||
|
|
@@ -426,12 +426,7 @@ main(int argc, char **argv){
|
||
|
|
if (n >= 0)
|
||
|
|
printf("%s: %d slices\n", ptp->type, n);
|
||
|
|
#endif
|
||
|
|
-
|
||
|
|
- if (n > 0) {
|
||
|
|
- close(fd);
|
||
|
|
- fd = -1;
|
||
|
|
- }
|
||
|
|
- else
|
||
|
|
+ if (n <= 0)
|
||
|
|
continue;
|
||
|
|
|
||
|
|
switch(what) {
|
||
|
|
@@ -649,9 +644,9 @@ main(int argc, char **argv){
|
||
|
|
if (n > 0)
|
||
|
|
break;
|
||
|
|
}
|
||
|
|
+ if (fd != -1)
|
||
|
|
+ close(fd);
|
||
|
|
if (what == LIST && loopcreated) {
|
||
|
|
- if (fd != -1)
|
||
|
|
- close(fd);
|
||
|
|
if (del_loop(device)) {
|
||
|
|
if (verbose)
|
||
|
|
fprintf(stderr, "can't del loop : %s\n",
|