1*4882a593SmuzhiyunFrom bc9c468a2ce84bc767234eec888b71f1bc744fff Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Darren Kenny <darren.kenny@oracle.com> 3*4882a593SmuzhiyunDate: Fri, 23 Oct 2020 09:49:59 +0000 4*4882a593SmuzhiyunSubject: [PATCH] kern/partition: Check for NULL before dereferencing input 5*4882a593Smuzhiyun string 6*4882a593Smuzhiyun 7*4882a593SmuzhiyunThere is the possibility that the value of str comes from an external 8*4882a593Smuzhiyunsource and continuing to use it before ever checking its validity is 9*4882a593Smuzhiyunwrong. So, needs fixing. 10*4882a593Smuzhiyun 11*4882a593SmuzhiyunAdditionally, drop unneeded part initialization. 12*4882a593Smuzhiyun 13*4882a593SmuzhiyunFixes: CID 292444 14*4882a593Smuzhiyun 15*4882a593SmuzhiyunSigned-off-by: Darren Kenny <darren.kenny@oracle.com> 16*4882a593SmuzhiyunReviewed-by: Daniel Kiper <daniel.kiper@oracle.com> 17*4882a593SmuzhiyunSigned-off-by: Stefan Sørensen <stefan.sorensen@spectralink.com> 18*4882a593Smuzhiyun--- 19*4882a593Smuzhiyun grub-core/kern/partition.c | 5 ++++- 20*4882a593Smuzhiyun 1 file changed, 4 insertions(+), 1 deletion(-) 21*4882a593Smuzhiyun 22*4882a593Smuzhiyundiff --git a/grub-core/kern/partition.c b/grub-core/kern/partition.c 23*4882a593Smuzhiyunindex e499147..b10a184 100644 24*4882a593Smuzhiyun--- a/grub-core/kern/partition.c 25*4882a593Smuzhiyun+++ b/grub-core/kern/partition.c 26*4882a593Smuzhiyun@@ -109,11 +109,14 @@ grub_partition_map_probe (const grub_partition_map_t partmap, 27*4882a593Smuzhiyun grub_partition_t 28*4882a593Smuzhiyun grub_partition_probe (struct grub_disk *disk, const char *str) 29*4882a593Smuzhiyun { 30*4882a593Smuzhiyun- grub_partition_t part = 0; 31*4882a593Smuzhiyun+ grub_partition_t part; 32*4882a593Smuzhiyun grub_partition_t curpart = 0; 33*4882a593Smuzhiyun grub_partition_t tail; 34*4882a593Smuzhiyun const char *ptr; 35*4882a593Smuzhiyun 36*4882a593Smuzhiyun+ if (str == NULL) 37*4882a593Smuzhiyun+ return 0; 38*4882a593Smuzhiyun+ 39*4882a593Smuzhiyun part = tail = disk->partition; 40*4882a593Smuzhiyun 41*4882a593Smuzhiyun for (ptr = str; *ptr;) 42*4882a593Smuzhiyun-- 43*4882a593Smuzhiyun2.14.2 44*4882a593Smuzhiyun 45