From 26de4296cc20bb45eb40560b4a4a98fa90a16a28 Mon Sep 17 00:00:00 2001 From: Sean Anderson Date: Sat, 15 May 2021 14:13:54 -0400 Subject: part: Add check for NULL dev_part_str Some callers (e.g. cmd/fs.c) of fs_set_blk_dev may use a NULL dev_part_str. While blk_get_device_part_str handles this fine, part_get_info_by_dev_and_name does not. This fixes commands crashing when implicitly using bootdevice. The unit test has also been updated to set bootdevice to a known value and to restore it after we are done. Fixes: 7194527b6a ("cmd: fs: Use part_get_info_by_dev_and_name_or_num to parse partitions") Reported-by: Heinrich Schuchardt Signed-off-by: Sean Anderson Reviewed-by: Simon Glass --- disk/part.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'disk/part.c') diff --git a/disk/part.c b/disk/part.c index 5e7e59c..086da84 100644 --- a/disk/part.c +++ b/disk/part.c @@ -714,7 +714,11 @@ static int part_get_info_by_dev_and_name(const char *dev_iface, int ret; /* Separate device and partition name specification */ - part_str = strchr(dev_part_str, '#'); + if (dev_part_str) + part_str = strchr(dev_part_str, '#'); + else + part_str = NULL; + if (part_str) { dup_str = strdup(dev_part_str); dup_str[part_str - dev_part_str] = 0; -- cgit v1.1