Andrew Geissler | b7d2861 | 2020-07-24 16:15:54 -0500 | [diff] [blame^] | 1 | From dcb36fd007ddb32d8c5cfcf5e9ddb3d713d65396 Mon Sep 17 00:00:00 2001 |
| 2 | From: Hongxu Jia <hongxu.jia@windriver.com> |
| 3 | Date: Tue, 21 Jul 2020 09:43:03 +0800 |
| 4 | Subject: [PATCH] fix up check for hardlinks always false if inode > 0xFFFFFFFF |
| 5 | |
| 6 | Since commit [382ed4a1 e2fsck: use proper types for variables][1] |
| 7 | applied, it used ext2_ino_t instead of ino_t for referencing inode |
| 8 | numbers, but the type of is_hardlink's `ino' should not be instead, |
| 9 | The ext2_ino_t is 32bit, if inode > 0xFFFFFFFF, its value will be |
| 10 | truncated. |
| 11 | |
| 12 | Add a debug printf to show the value of inode, when it check for hardlink |
| 13 | files, it will always return false if inode > 0xFFFFFFFF |
| 14 | |--- a/misc/create_inode.c |
| 15 | |+++ b/misc/create_inode.c |
| 16 | |@@ -605,6 +605,7 @@ static int is_hardlink(struct hdlinks_s *hdlinks, dev_t dev, ext2_ino_t ino) |
| 17 | | { |
| 18 | | int i; |
| 19 | | |
| 20 | |+ printf("%s %d, %lX, %lX\n", __FUNCTION__, __LINE__, hdlinks->hdl[i].src_ino, ino); |
| 21 | | for (i = 0; i < hdlinks->count; i++) { |
| 22 | | if (hdlinks->hdl[i].src_dev == dev && |
| 23 | | hdlinks->hdl[i].src_ino == ino) |
| 24 | |
| 25 | Here is debug message: |
| 26 | is_hardlink 608, 2913DB886, 913DB886 |
| 27 | |
| 28 | The length of ext2_ino_t is 32bit (typedef __u32 __bitwise ext2_ino_t;), |
| 29 | and ino_t is 64bit on 64bit system (such as x86-64), recover `ino' to ino_t. |
| 30 | |
| 31 | [1] https://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git/commit/?id=382ed4a1c2b60acb9db7631e86dda207bde6076e |
| 32 | |
| 33 | Upstream-Status: Submitted [https://github.com/tytso/e2fsprogs/pull/48] |
| 34 | |
| 35 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> |
| 36 | --- |
| 37 | misc/create_inode.c | 2 +- |
| 38 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 39 | |
| 40 | diff --git a/misc/create_inode.c b/misc/create_inode.c |
| 41 | index e8d1df6b..837f3875 100644 |
| 42 | --- a/misc/create_inode.c |
| 43 | +++ b/misc/create_inode.c |
| 44 | @@ -601,7 +601,7 @@ out: |
| 45 | return err; |
| 46 | } |
| 47 | |
| 48 | -static int is_hardlink(struct hdlinks_s *hdlinks, dev_t dev, ext2_ino_t ino) |
| 49 | +static int is_hardlink(struct hdlinks_s *hdlinks, dev_t dev, ino_t ino) |
| 50 | { |
| 51 | int i; |
| 52 | |
| 53 | -- |
| 54 | 2.18.2 |
| 55 | |