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

Commit 46ee3303 authored by Manoj Prabhu B's avatar Manoj Prabhu B
Browse files

diag: Prevent out of bound access while getting build mask 



Add check for minimum length before typecasting to build mask
structure to prevent out of bound access.

CRs-Fixed: 2431005
Change-Id: I97b439ead62c8a67869c9209442ef771308f2d3f
Signed-off-by: default avatarManoj Prabhu B <bmanoj@codeaurora.org>
parent cfdb80fe

drivers/char/diag/diag_masks.c

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

/* Copyright (c) 2008-2019, 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
@@ -641,7 +641,8 @@ static int diag_cmd_get_build_mask(unsigned char *src_buf, int src_len, 
	struct diag_build_mask_req_t *req = NULL;

	struct diag_msg_build_mask_t rsp;



	if (!src_buf || !dest_buf || src_len <= 0 || dest_len <= 0) {

	if (!src_buf || !dest_buf || src_len <= 0 || dest_len <= 0 ||

		src_len < sizeof(struct diag_build_mask_req_t)) {

		pr_err("diag: Invalid input in %s, src_buf: %pK, src_len: %d, dest_buf: %pK, dest_len: %d\n",

		       __func__, src_buf, src_len, dest_buf, dest_len);

		return -EINVAL;