42 lines
1.2 KiB
Diff
42 lines
1.2 KiB
Diff
|
|
From 46ab86660a841a6ec5100d183f3881632a3055cf Mon Sep 17 00:00:00 2001
|
||
|
|
From: Anthony Iliopoulos <ailiop@suse.com>
|
||
|
|
Date: Tue, 26 May 2020 14:35:51 -0400
|
||
|
|
Subject: [PATCH 06/16] xfs_db: fix crc invalidation segfault
|
||
|
|
|
||
|
|
The nowrite_ops var is declared within nested block scope but used
|
||
|
|
outside that scope, causing xfs_db to crash while trying to defererence
|
||
|
|
the verify_write pointer. Fix it by lifting the declaration to the outer
|
||
|
|
scope, where it is accessed.
|
||
|
|
|
||
|
|
Fixes: b64af2c48220c8 ("xfs_db: add crc manipulation commands")
|
||
|
|
Reviewed-by: Eric Sandeen <sandeen@redhat.com>
|
||
|
|
Signed-off-by: Anthony Iliopoulos <ailiop@suse.com>
|
||
|
|
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
|
||
|
|
---
|
||
|
|
db/crc.c | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/db/crc.c b/db/crc.c
|
||
|
|
index 95161c6..b23417a 100644
|
||
|
|
--- a/db/crc.c
|
||
|
|
+++ b/db/crc.c
|
||
|
|
@@ -53,6 +53,7 @@ crc_f(
|
||
|
|
char **argv)
|
||
|
|
{
|
||
|
|
const struct xfs_buf_ops *stashed_ops = NULL;
|
||
|
|
+ struct xfs_buf_ops nowrite_ops;
|
||
|
|
extern char *progname;
|
||
|
|
const field_t *fields;
|
||
|
|
const ftattr_t *fa;
|
||
|
|
@@ -127,7 +128,6 @@ crc_f(
|
||
|
|
}
|
||
|
|
|
||
|
|
if (invalidate) {
|
||
|
|
- struct xfs_buf_ops nowrite_ops;
|
||
|
|
flist_t *sfl;
|
||
|
|
int bit_length;
|
||
|
|
int parentoffset;
|
||
|
|
--
|
||
|
|
1.8.3.1
|
||
|
|
|