0090-util-grub-editenv-Fix-incorrect-casting-of-a-signed-.patch 1.4 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647
  1. From 5dc41edc4eba259c6043ae7698c245ec1baaacc6 Mon Sep 17 00:00:00 2001
  2. From: Darren Kenny <darren.kenny@oracle.com>
  3. Date: Thu, 5 Nov 2020 14:33:50 +0000
  4. Subject: [PATCH] util/grub-editenv: Fix incorrect casting of a signed value
  5. The return value of ftell() may be negative (-1) on error. While it is
  6. probably unlikely to occur, we should not blindly cast to an unsigned
  7. value without first testing that it is not negative.
  8. Fixes: CID 73856
  9. Signed-off-by: Darren Kenny <darren.kenny@oracle.com>
  10. Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
  11. Signed-off-by: Stefan Sørensen <stefan.sorensen@spectralink.com>
  12. ---
  13. util/grub-editenv.c | 8 +++++++-
  14. 1 file changed, 7 insertions(+), 1 deletion(-)
  15. diff --git a/util/grub-editenv.c b/util/grub-editenv.c
  16. index f3662c9..db6f187 100644
  17. --- a/util/grub-editenv.c
  18. +++ b/util/grub-editenv.c
  19. @@ -125,6 +125,7 @@ open_envblk_file (const char *name)
  20. {
  21. FILE *fp;
  22. char *buf;
  23. + long loc;
  24. size_t size;
  25. grub_envblk_t envblk;
  26. @@ -143,7 +144,12 @@ open_envblk_file (const char *name)
  27. grub_util_error (_("cannot seek `%s': %s"), name,
  28. strerror (errno));
  29. - size = (size_t) ftell (fp);
  30. + loc = ftell (fp);
  31. + if (loc < 0)
  32. + grub_util_error (_("cannot get file location `%s': %s"), name,
  33. + strerror (errno));
  34. +
  35. + size = (size_t) loc;
  36. if (fseek (fp, 0, SEEK_SET) < 0)
  37. grub_util_error (_("cannot seek `%s': %s"), name,
  38. --
  39. 2.14.2