Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 6a050da45b5d855b48b057446847ff1542977b52

Authored by Mark Huang
Committed by Linus Torvalds
1 parent 698d070746
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

[PATCH] initramfs: fix CPIO hardlink check 

Copy the filenames of hardlinks when inserting them into the hash, since
the "name" pointer may point to scratch space (name_buf).  Not doing so
results in corruption if the scratch space is later overwritten: the wrong
file may be hardlinked, or, if the scratch space contains garbage, the link
will fail and a 0-byte file will be created instead.

Signed-off-by: Mark Huang <mlhuang@cs.princeton.edu>
Acked-by: Al Viro <viro@zeniv.linux.org.uk>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Showing 1 changed file with 4 additions and 4 deletions Side-by-side Diff

... ... @@ -26,10 +26,12 @@
26 26  
27 27 /* link hash */
28 28  
  29 +#define N_ALIGN(len) ((((len) + 1) & ~3) + 2)
  30 +
29 31 static __initdata struct hash {
30 32 int ino, minor, major;
31 33 struct hash *next;
32   - char *name;
  34 + char name[N_ALIGN(PATH_MAX)];
33 35 } *head[32];
34 36  
35 37 static inline int hash(int major, int minor, int ino)
... ... @@ -57,7 +59,7 @@
57 59 q->ino = ino;
58 60 q->minor = minor;
59 61 q->major = major;
60   - q->name = name;
  62 + strcpy(q->name, name);
61 63 q->next = NULL;
62 64 *p = q;
63 65 return NULL;
... ... @@ -132,8 +134,6 @@
132 134 this_header += n;
133 135 count -= n;
134 136 }
135   -
136   -#define N_ALIGN(len) ((((len) + 1) & ~3) + 2)
137 137  
138 138 static __initdata char *collected;
139 139 static __initdata int remains;