diff options
| author | Colin Ian King <colin.king@canonical.com> | 2018-02-22 17:50:12 +0000 |
|---|---|---|
| committer | Sasha Levin <alexander.levin@microsoft.com> | 2018-03-20 23:49:50 -0400 |
| commit | 35c2a6d45dde1dc8ec418bf4a467b059500237f1 (patch) | |
| tree | 4d0a1a8fdf5c7844f2ce11bf8cb58ea837e61abc /arch | |
| parent | d2d87618ef5828045d38cf29970d935f9f4c9230 (diff) | |
MIPS: ath25: Check for kzalloc allocation failure
[ Upstream commit 1b22b4b28fd5fbc51855219e3238b3ab81da8466 ]
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>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Diffstat (limited to 'arch')
| -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 b8bb78282d6a..7df779f2cb63 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) { |