From be78f86efc1f03c6b77e1685c93afbd615ee8ece Mon Sep 17 00:00:00 2001 From: Alexander Shiyan Date: Sun, 7 Apr 2013 16:19:39 +0400 Subject: [PATCH] mci: Fix bug if probe parameter is omitted barebox@Phytec phyCORE-i.MX27:/ mci0.probe= unable to handle NULL pointer dereference at address 0x00000000 pc : [] lr : [] sp : a7fff8e0 ip : 00000000 fp : 00000001 r10: 00000000 r9 : a6ffba8c r8 : 00000000 r7 : a7fffad0 r6 : a6ffbb04 r5 : a6fdd5cc r4 : a6fdd658 r3 : a7f18760 r2 : 00000000 r1 : 00000000 r0 : 00000000 Flags: nZCv IRQs off FIQs off Mode SVC_32 [] (simple_strtoul+0xc/0xc0) from [] (mci_set_probe+0xc94/0xd64) [] (mci_set_probe+0xc94/0xd64) from [] (dev_set_param+0x74/0x8c) [] (dev_set_param+0x74/0x8c) from [] (setenv+0x60/0xd8) [] (setenv+0x60/0xd8) from [] (set_local_var.isra.3+0x5c/0x7c) [] (set_local_var.isra.3+0x5c/0x7c) from [] (run_list_real+0x494/0x934) [] (run_list_real+0x494/0x934) from [] (parse_stream_outer+0x198/0x270) [] (parse_stream_outer+0x198/0x270) from [] (run_shell+0x3c/0x7c) [] (run_shell+0x3c/0x7c) from [] (execute_command+0x38/0x78) [] (execute_command+0x38/0x78) from [] (run_list_real+0x7e0/0x934) [] (run_list_real+0x7e0/0x934) from [] (run_list_real+0x414/0x934) [] (unwind_backtrace+0x0/0xa8) from [] (panic+0x28/0x3c) [] (panic+0x28/0x3c) from [] (do_exception+0x10/0x14) [] (do_exception+0x10/0x14) from [] (do_data_abort+0x2c/0x38) [] (do_data_abort+0x2c/0x38) from [] (data_abort+0x48/0x60) Signed-off-by: Alexander Shiyan Signed-off-by: Sascha Hauer --- drivers/mci/mci-core.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/mci/mci-core.c b/drivers/mci/mci-core.c index c8598c2dc..aef5c690c 100644 --- a/drivers/mci/mci-core.c +++ b/drivers/mci/mci-core.c @@ -1465,6 +1465,9 @@ static int mci_set_probe(struct device_d *mci_dev, struct param_d *param, if (rc != 0) return 0; + if (!val) + return -EINVAL; + probe = simple_strtoul(val, NULL, 0); if (probe != 0) { rc = mci_card_probe(mci);