| Message ID | 1445947687-9917-2-git-send-email-p.marczak@samsung.com |
|---|---|
| State | Accepted |
| Delegated to: | Minkyu Kang |
| Headers | show |
On 27 October 2015 at 06:07, Przemyslaw Marczak <p.marczak@samsung.com> wrote: > The function get_board_type() is called in two places by common code, > but the returned pointer was never check. > > This commit adds checking the returned pointer, before use it. > > Signed-off-by: Przemyslaw Marczak <p.marczak@samsung.com> > Cc: Minkyu Kang <mk7.kang@samsung.com> > --- > Changes V2: > - new commit > --- > board/samsung/common/board.c | 4 ++-- > board/samsung/common/misc.c | 3 +++ > 2 files changed, 5 insertions(+), 2 deletions(-) > Reviewed-by: Simon Glass <sjg@chromium.org>
On 29 October 2015 at 00:20, Simon Glass <sjg@chromium.org> wrote: > On 27 October 2015 at 06:07, Przemyslaw Marczak <p.marczak@samsung.com> wrote: >> The function get_board_type() is called in two places by common code, >> but the returned pointer was never check. >> >> This commit adds checking the returned pointer, before use it. >> >> Signed-off-by: Przemyslaw Marczak <p.marczak@samsung.com> >> Cc: Minkyu Kang <mk7.kang@samsung.com> >> --- >> Changes V2: >> - new commit >> --- >> board/samsung/common/board.c | 4 ++-- >> board/samsung/common/misc.c | 3 +++ >> 2 files changed, 5 insertions(+), 2 deletions(-) >> > > Reviewed-by: Simon Glass <sjg@chromium.org> Tested-by: Anand Moon <linux.amoon@gmail.com> -Anand Moon
diff --git a/board/samsung/common/board.c b/board/samsung/common/board.c index d32c75d..1334c22 100644 --- a/board/samsung/common/board.c +++ b/board/samsung/common/board.c @@ -304,8 +304,8 @@ int checkboard(void) printf("Board: %s\n", board_info ? board_info : "unknown"); #ifdef CONFIG_BOARD_TYPES board_info = get_board_type(); - - printf("Model: %s\n", board_info ? board_info : "unknown"); + if (board_info) + printf("Type: %s\n", board_info); #endif return 0; } diff --git a/board/samsung/common/misc.c b/board/samsung/common/misc.c index e0e2c48..c8316d8 100644 --- a/board/samsung/common/misc.c +++ b/board/samsung/common/misc.c @@ -85,6 +85,9 @@ void set_board_info(void) #ifdef CONFIG_BOARD_TYPES bdtype = get_board_type(); + if (!bdtype) + bdtype = ""; + sprintf(info, "%s%s", bdname, bdtype); setenv("boardname", info); #endif
The function get_board_type() is called in two places by common code, but the returned pointer was never check. This commit adds checking the returned pointer, before use it. Signed-off-by: Przemyslaw Marczak <p.marczak@samsung.com> Cc: Minkyu Kang <mk7.kang@samsung.com> --- Changes V2: - new commit --- board/samsung/common/board.c | 4 ++-- board/samsung/common/misc.c | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-)