kernel
/
dracut
mirror of https://git.kernel.org/pub/scm/boot/dracut/dracut.git/
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(skipcpio): calculate and use CPIO_MAGIC_LEN 

Signed-off-by: Shreenidhi Shedi <sshedi@vmware.com>
master
Shreenidhi Shedi 2021-08-25 15:08:40 +05:30 committed by Jóhann B. Guðmundsson
parent f6d16b6bbd
commit 3fb8723ce0
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/skipcpio/skipcpio.c
View File

@ -28,6 +28,7 @@
#include <string.h>

#define CPIO_MAGIC "070701"
#define CPIO_MAGIC_LEN (sizeof(CPIO_MAGIC) - 1)

#define CPIO_END "TRAILER!!!"
#define CPIO_ENDLEN (sizeof(CPIO_END) - 1)
@ -41,7 +42,7 @@
__func__, ##__VA_ARGS__)

struct cpio_header {
char c_magic[6];
char c_magic[CPIO_MAGIC_LEN];
char c_ino[8];
char c_mode[8];
char c_uid[8];
@ -103,7 +104,7 @@ int main(int argc, char **argv)
}

/* check, if this is a cpio archive */
if (memcmp(buf.cpio.h.c_magic, CPIO_MAGIC, 6)) {
if (memcmp(buf.cpio.h.c_magic, CPIO_MAGIC, CPIO_MAGIC_LEN)) {
goto cat_rest;
}

@ -138,7 +139,7 @@ int main(int argc, char **argv)
goto end;
}

if (memcmp(buf.cpio.h.c_magic, CPIO_MAGIC, 6)) {
if (memcmp(buf.cpio.h.c_magic, CPIO_MAGIC, CPIO_MAGIC_LEN)) {
pr_err("Corrupt CPIO archive!\n");
goto end;
}