openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

linux-user/elfload: Use Error for load_elf_interp 

This is slightly clearer than just using strerror, though
the different forms produced by error_setg_file_open and
error_setg_errno isn't entirely convenient.

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20201021173749.111103-10-richard.henderson@linaro.org
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Richard Henderson 2020-10-21 10:37:46 -07:00 committed by Peter Maydell
parent c7f17e7bd7
commit 808f656318
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
linux-user/elfload.c
View File

@ -2675,26 +2675,27 @@ static void load_elf_interp(const char *filename, struct image_info *info,
char bprm_buf[BPRM_BUF_SIZE]) char bprm_buf[BPRM_BUF_SIZE])
{ {
int fd, retval; int fd, retval;
Error *err = NULL;
fd = open(path(filename), O_RDONLY); fd = open(path(filename), O_RDONLY);
if (fd < 0) { if (fd < 0) {
goto exit_perror; error_setg_file_open(&err, errno, filename);
error_report_err(err);
exit(-1);
} }
retval = read(fd, bprm_buf, BPRM_BUF_SIZE); retval = read(fd, bprm_buf, BPRM_BUF_SIZE);
if (retval < 0) { if (retval < 0) {
goto exit_perror; error_setg_errno(&err, errno, "Error reading file header");
error_reportf_err(err, "%s: ", filename);
exit(-1);
} }
if (retval < BPRM_BUF_SIZE) { if (retval < BPRM_BUF_SIZE) {
memset(bprm_buf + retval, 0, BPRM_BUF_SIZE - retval); memset(bprm_buf + retval, 0, BPRM_BUF_SIZE - retval);
} }
load_elf_image(filename, fd, info, NULL, bprm_buf); load_elf_image(filename, fd, info, NULL, bprm_buf);
return;
exit_perror:
fprintf(stderr, "%s: %s\n", filename, strerror(errno));
exit(-1);
} }
static int symfind(const void *s0, const void *s1) static int symfind(const void *s0, const void *s1)