| Message ID | 1591775719-28390-1-git-send-email-clabbe@baylibre.com |
|---|---|
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
| Series | sparc: piggyback: handle invalid image | expand |
From: Corentin Labbe <clabbe@baylibre.com> Date: Wed, 10 Jun 2020 07:55:19 +0000 > With an old elftoaout, the generation of tftpboot.img fail with "lseek: > invalid argument". > This is due to offset being negative. > > Instead of printing this error message, let's print a better one. > > Signed-off-by: Corentin Labbe <clabbe@baylibre.com> Applied, thank you.
diff --git a/arch/sparc/boot/piggyback.c b/arch/sparc/boot/piggyback.c index a7a38fb4ece0..613e23a1016e 100644 --- a/arch/sparc/boot/piggyback.c +++ b/arch/sparc/boot/piggyback.c @@ -154,6 +154,10 @@ static off_t get_hdrs_offset(int kernelfd, const char *filename) offset -= LOOKBACK; /* skip a.out header */ offset += AOUT_TEXT_OFFSET; + if (offset < 0) { + errno = -EINVAL; + die("Calculated a negative offset, probably elftoaout generated an invalid image. Did you use a recent elftoaout ?"); + } if (lseek(kernelfd, offset, SEEK_SET) < 0) die("lseek"); if (read(kernelfd, buffer, BUFSIZE) != BUFSIZE)
With an old elftoaout, the generation of tftpboot.img fail with "lseek: invalid argument". This is due to offset being negative. Instead of printing this error message, let's print a better one. Signed-off-by: Corentin Labbe <clabbe@baylibre.com> --- arch/sparc/boot/piggyback.c | 4 ++++ 1 file changed, 4 insertions(+)