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

Commit b8cd1fca authored by Mohit Aggarwal's avatar Mohit Aggarwal
Browse files

diag: Add NULL pointer checks in mask updates 



Currently, NULL pointer checks are missing in mask
update functions which might lead to NULL pointer
dereference issues. This patch fixes the issue by
adding appropriate checks.

CRs-Fixed: 2015104
Change-Id: I9df99208e283c8d90921c6e20a6a80f88c18a327
Signed-off-by: default avatarMohit Aggarwal <maggarwa@codeaurora.org>
parent 796d604a

drivers/char/diag/diag_masks.c

+8 −4
Original line number Diff line number Diff line 
/* Copyright (c) 2008-2016, The Linux Foundation. All rights reserved.

/* Copyright (c) 2008-2017, The Linux Foundation. All rights reserved.

 *

 * 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
@@ -112,10 +112,12 @@ static void diag_send_log_mask_update(uint8_t peripheral, int equip_id) 
	else

		mask_info = &log_mask;



	if (!mask_info)

	if (!mask_info || !mask_info->ptr || !mask_info->update_buf)

		return;



	mask = (struct diag_log_mask_t *)mask_info->ptr;

	if (!mask->ptr)

		return;

	buf = mask_info->update_buf;



	switch (mask_info->status) {
@@ -224,7 +226,7 @@ static void diag_send_event_mask_update(uint8_t peripheral) 
	else

		mask_info = &event_mask;



	if (!mask_info)

	if (!mask_info || !mask_info->ptr || !mask_info->update_buf)

		return;



	buf = mask_info->update_buf;
@@ -305,10 +307,12 @@ static void diag_send_msg_mask_update(uint8_t peripheral, int first, int last) 
	else

		mask_info = &msg_mask;



	if (!mask_info)

	if (!mask_info || !mask_info->ptr || !mask_info->update_buf)

		return;



	mask = (struct diag_msg_mask_t *)mask_info->ptr;

	if (!mask->ptr)

		return;

	buf = mask_info->update_buf;

	mutex_lock(&mask_info->lock);

	switch (mask_info->status) {