diff options
| author | Colin Ian King <colin.king@canonical.com> | 2018-02-22 17:50:12 +0000 |
|---|---|---|
| committer | James Hogan <jhogan@kernel.org> | 2018-02-23 09:35:54 +0000 |
| commit | 1b22b4b28fd5fbc51855219e3238b3ab81da8466 (patch) | |
| tree | eb9760274125b673e319c4baebc7006caf948ff5 /arch/mips | |
| parent | 6ae1756faddefd7494353380ee546dd38c2f97eb (diff) | |
| download | linux-stable-1b22b4b28fd5fbc51855219e3238b3ab81da8466.tar.gz linux-stable-1b22b4b28fd5fbc51855219e3238b3ab81da8466.tar.bz2 linux-stable-1b22b4b28fd5fbc51855219e3238b3ab81da8466.zip | |
MIPS: ath25: Check for kzalloc allocation failure
Currently there is no null check on a failed allocation of board_data,
and hence a null pointer dereference will occurr. Fix this by checking
for the out of memory null pointer.
Fixes: a7473717483e ("MIPS: ath25: add board configuration detection")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: linux-mips@linux-mips.org
Cc: <stable@vger.kernel.org> # 3.19+
Patchwork: https://patchwork.linux-mips.org/patch/18657/
Signed-off-by: James Hogan <jhogan@kernel.org>
Diffstat (limited to 'arch/mips')
| -rw-r--r-- | arch/mips/ath25/board.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/mips/ath25/board.c b/arch/mips/ath25/board.c index 9ab48ff80c1c..6d11ae581ea7 100644 --- a/arch/mips/ath25/board.c +++ b/arch/mips/ath25/board.c @@ -135,6 +135,8 @@ int __init ath25_find_config(phys_addr_t base, unsigned long size) } board_data = kzalloc(BOARD_CONFIG_BUFSZ, GFP_KERNEL); + if (!board_data) + goto error; ath25_board.config = (struct ath25_boarddata *)board_data; memcpy_fromio(board_data, bcfg, 0x100); if (broken_boarddata) { |