1*4882a593SmuzhiyunFrom f41f0af48ab7f7c135aac17ac862c30bde0bbab7 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Daniel Axtens <dja@axtens.net> 3*4882a593SmuzhiyunDate: Wed, 13 Jan 2021 22:19:01 +1100 4*4882a593SmuzhiyunSubject: [PATCH] kern/misc: Always set *end in grub_strtoull() 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunCurrently, if there is an error in grub_strtoull(), *end is not set. 7*4882a593SmuzhiyunThis differs from the usual behavior of strtoull(), and also means that 8*4882a593Smuzhiyunsome callers may use an uninitialized value for *end. 9*4882a593Smuzhiyun 10*4882a593SmuzhiyunSet *end unconditionally. 11*4882a593Smuzhiyun 12*4882a593SmuzhiyunSigned-off-by: Daniel Axtens <dja@axtens.net> 13*4882a593SmuzhiyunReviewed-by: Daniel Kiper <daniel.kiper@oracle.com> 14*4882a593SmuzhiyunSigned-off-by: Stefan Sørensen <stefan.sorensen@spectralink.com> 15*4882a593Smuzhiyun--- 16*4882a593Smuzhiyun grub-core/kern/misc.c | 8 ++++++++ 17*4882a593Smuzhiyun 1 file changed, 8 insertions(+) 18*4882a593Smuzhiyun 19*4882a593Smuzhiyundiff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c 20*4882a593Smuzhiyunindex a7abd36..b02693b 100644 21*4882a593Smuzhiyun--- a/grub-core/kern/misc.c 22*4882a593Smuzhiyun+++ b/grub-core/kern/misc.c 23*4882a593Smuzhiyun@@ -406,6 +406,10 @@ grub_strtoull (const char *str, char **end, int base) 24*4882a593Smuzhiyun { 25*4882a593Smuzhiyun grub_error (GRUB_ERR_OUT_OF_RANGE, 26*4882a593Smuzhiyun N_("overflow is detected")); 27*4882a593Smuzhiyun+ 28*4882a593Smuzhiyun+ if (end) 29*4882a593Smuzhiyun+ *end = (char *) str; 30*4882a593Smuzhiyun+ 31*4882a593Smuzhiyun return ~0ULL; 32*4882a593Smuzhiyun } 33*4882a593Smuzhiyun 34*4882a593Smuzhiyun@@ -417,6 +421,10 @@ grub_strtoull (const char *str, char **end, int base) 35*4882a593Smuzhiyun { 36*4882a593Smuzhiyun grub_error (GRUB_ERR_BAD_NUMBER, 37*4882a593Smuzhiyun N_("unrecognized number")); 38*4882a593Smuzhiyun+ 39*4882a593Smuzhiyun+ if (end) 40*4882a593Smuzhiyun+ *end = (char *) str; 41*4882a593Smuzhiyun+ 42*4882a593Smuzhiyun return 0; 43*4882a593Smuzhiyun } 44*4882a593Smuzhiyun 45*4882a593Smuzhiyun-- 46*4882a593Smuzhiyun2.14.2 47*4882a593Smuzhiyun 48