From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C03F0C32771 for ; Fri, 24 Jan 2020 09:50:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8960720718 for ; Fri, 24 Jan 2020 09:50:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579859411; bh=+m/480iVfQQB6uESfmSRhvRXpJEL1zCGSoqTGmodM10=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=WygMRV+KLuV+MlzI628SyVJsLjzEWCPyyOe3f3qDoaIYEdbQJGNELfjKOHg2Cgiv4 Bn0dm/LcbWOGBxWs/+xhH8Mxp3U5FRxxEwdk/pmc0+khv2sq0T64j9KH687FU7Rqq9 /SJFnx+1jAHr24gJO3jAianVUF5nIhzEMtHaXgtA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387910AbgAXJuK (ORCPT ); Fri, 24 Jan 2020 04:50:10 -0500 Received: from mail.kernel.org ([198.145.29.99]:50816 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387908AbgAXJuK (ORCPT ); Fri, 24 Jan 2020 04:50:10 -0500 Received: from localhost (unknown [145.15.244.15]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C6BB7208C4; Fri, 24 Jan 2020 09:50:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579859409; bh=+m/480iVfQQB6uESfmSRhvRXpJEL1zCGSoqTGmodM10=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MMqMbY3hg1lWmPYt4LS3tg79yhkUWGnZnkDS7osiZK5Y83y/lVxYo/E9lYmKmtCMg lQHUOKH1TgsYvlJYcNsZWxt6JQ71UgcwdiirzlJIn6UiOSHxv0VZ9+DEvG4Sb8oZ/p n/N+ePMjdNf8uVLiMeJSSNnOMxF3qq3bCFMy+d7A= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Nicholas Mc Guire , Sasha Levin Subject: [PATCH 4.14 111/343] staging: r8822be: check kzalloc return or bail Date: Fri, 24 Jan 2020 10:28:49 +0100 Message-Id: <20200124092934.646861969@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200124092919.490687572@linuxfoundation.org> References: <20200124092919.490687572@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Nicholas Mc Guire [ Upstream commit e4b08e16b7d9d030b6475ef48f94d734a39f3c81 ] The kzalloc() in halmac_parse_psd_data_88xx() can fail and return NULL so check the psd_set->data after allocation and if allocation failed return HALMAC_CMD_PROCESS_ERROR. Signed-off-by: Nicholas Mc Guire Fixes: 938a0447f094 ("staging: r8822be: Add code for halmac sub-drive") Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- .../staging/rtlwifi/halmac/halmac_88xx/halmac_func_88xx.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_func_88xx.c b/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_func_88xx.c index 544f638ed3efb..15091ee587dbf 100644 --- a/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_func_88xx.c +++ b/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_func_88xx.c @@ -2492,8 +2492,11 @@ halmac_parse_psd_data_88xx(struct halmac_adapter *halmac_adapter, u8 *c2h_buf, segment_size = (u8)PSD_DATA_GET_SEGMENT_SIZE(c2h_buf); psd_set->data_size = total_size; - if (!psd_set->data) + if (!psd_set->data) { psd_set->data = kzalloc(psd_set->data_size, GFP_KERNEL); + if (!psd_set->data) + return HALMAC_CMD_PROCESS_ERROR; + } if (segment_id == 0) psd_set->segment_size = segment_size; -- 2.20.1