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

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

Merge "diag: Check command size against the minimum before parsing"

parents 7dcc7ba1 97e91808

drivers/char/diag/diag_masks.c

+2 −2
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

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

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

 */



#include <linux/slab.h>
@@ -695,7 +695,7 @@ static int diag_cmd_get_msg_mask(unsigned char *src_buf, int src_len, 


	mask_info = (!info) ? &msg_mask : info->msg_mask;

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

	    !mask_info) {

	    !mask_info || (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, mask_info: %pK\n",

		       __func__, src_buf, src_len, dest_buf, dest_len,

		       mask_info);