Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-26 15:28:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

part: Add check for NULL dev_part_str

Browse source 
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:
Sean Anderson 2021-05-15 14:13:54 -04:00 • committed by Tom Rini
parent 1e7879045f
commit 26de4296cc
2 changed files with 36 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
disk/part.c
View file

@ -714,7 +714,11 @@ static int part_get_info_by_dev_and_name(const char *dev_iface,
int ret; int ret;
/* Separate device and partition name specification */ /* 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) { if (part_str) {
dup_str = strdup(dev_part_str); dup_str = strdup(dev_part_str);
dup_str[part_str - dev_part_str] = 0; dup_str[part_str - dev_part_str] = 0;

39
test/dm/part.c
View file

@ -11,11 +11,25 @@
#include <dm/test.h> #include <dm/test.h>
#include <test/ut.h> #include <test/ut.h>
static int dm_test_part(struct unit_test_state *uts) static inline int do_test(struct unit_test_state *uts, int expected,
const char *part_str, bool whole)
{ {
char str_disk_guid[UUID_STR_LEN + 1];
struct blk_desc *mmc_dev_desc; struct blk_desc *mmc_dev_desc;
struct disk_partition part_info; struct disk_partition part_info;
ut_asserteq(expected,
part_get_info_by_dev_and_name_or_num("mmc", part_str,
&mmc_dev_desc,
&part_info, whole));
return 0;
}
static int dm_test_part(struct unit_test_state *uts)
{
char *oldbootdevice;
char str_disk_guid[UUID_STR_LEN + 1];
int ret;
struct blk_desc *mmc_dev_desc;
struct disk_partition parts[2] = { struct disk_partition parts[2] = {
{ {
.start = 48, /* GPT data takes up the first 34 blocks or so */ .start = 48, /* GPT data takes up the first 34 blocks or so */
@ -38,16 +52,22 @@ static int dm_test_part(struct unit_test_state *uts)
ut_assertok(gpt_restore(mmc_dev_desc, str_disk_guid, parts, ut_assertok(gpt_restore(mmc_dev_desc, str_disk_guid, parts,
ARRAY_SIZE(parts))); ARRAY_SIZE(parts)));
#define test(expected, part_str, whole) \ oldbootdevice = env_get("bootdevice");
ut_asserteq(expected, \
part_get_info_by_dev_and_name_or_num("mmc", part_str, \
&mmc_dev_desc, \
&part_info, whole))
#define test(expected, part_str, whole) do { \
ret = do_test(uts, expected, part_str, whole); \
if (ret) \
goto out; \
} while (0)
env_set("bootdevice", NULL);
test(-ENODEV, NULL, true);
test(-ENODEV, "", true); test(-ENODEV, "", true);
env_set("bootdevice", "0"); env_set("bootdevice", "0");
test(0, NULL, true);
test(0, "", true); test(0, "", true);
env_set("bootdevice", "1"); env_set("bootdevice", "1");
test(1, NULL, false);
test(1, "", false); test(1, "", false);
test(1, "-", false); test(1, "-", false);
env_set("bootdevice", ""); env_set("bootdevice", "");
@ -70,7 +90,10 @@ static int dm_test_part(struct unit_test_state *uts)
test(-EINVAL, "1#bogus", false); test(-EINVAL, "1#bogus", false);
test(1, "1#test1", false); test(1, "1#test1", false);
test(2, "1#test2", false); test(2, "1#test2", false);
ret = 0;
return 0; out:
env_set("bootdevice", oldbootdevice);
return ret;
} }
DM_TEST(dm_test_part, UT_TESTF_SCAN_PDATA | UT_TESTF_SCAN_FDT); DM_TEST(dm_test_part, UT_TESTF_SCAN_PDATA | UT_TESTF_SCAN_FDT);