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 <xypron.glpk@gmx.de>
Signed-off-by: Sean Anderson <seanga2@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user