Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bc63ab5a authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: ipa3: Add check to avoid Null pointer dereference"

parents 71785638 6ede1b65

drivers/platform/msm/ipa/ipa_v3/ipa_dp.c

+4 −0
Original line number Original line Diff line number Diff line
@@ -3073,6 +3073,10 @@ static void ipa3_wq_rx_common(struct ipa3_sys_context *sys, 
	struct ipa3_sys_context *coal_sys;

	struct ipa3_sys_context *coal_sys;

	int ipa_ep_idx;

	int ipa_ep_idx;





	if (!notify) {

		IPAERR_RL("gsi_chan_xfer_notify is null\n");

		return;

	}

	rx_skb = handle_skb_completion(notify, true);

	rx_skb = handle_skb_completion(notify, true);





	if (rx_skb) {

	if (rx_skb) {

drivers/platform/msm/ipa/ipa_v3/ipa_intf.c

+3 −1
Original line number Original line Diff line number Diff line 
/* Copyright (c) 2013-2018, The Linux Foundation. All rights reserved.

/* Copyright (c) 2013-2019, The Linux Foundation. All rights reserved.

 *

 *

 * This program is free software; you can redistribute it and/or modify

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and

 * it under the terms of the GNU General Public License version 2 and
@@ -400,6 +400,8 @@ static int wlan_msg_process(struct ipa_msg_meta *meta, void *buff) 
	uint8_t mac[IPA_MAC_ADDR_SIZE];

	uint8_t mac[IPA_MAC_ADDR_SIZE];

	uint8_t mac2[IPA_MAC_ADDR_SIZE];

	uint8_t mac2[IPA_MAC_ADDR_SIZE];





	if (!buff)

		return -EINVAL;

	if (meta->msg_type == WLAN_CLIENT_CONNECT_EX) {

	if (meta->msg_type == WLAN_CLIENT_CONNECT_EX) {

		/* debug print */

		/* debug print */

		event_ex_cur_con = buff;

		event_ex_cur_con = buff;