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

Commit 091003d5 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "diag: Add kmemleak_not_leak check to mark certain objects"

parents d3e080e8 d86c3b36

drivers/char/diag/diag_masks.c

+2 −0
Original line number Diff line number Diff line
@@ -1023,6 +1023,7 @@ int diag_create_msg_mask_table_entry(struct diag_msg_mask_t *msg_mask, 
					GFP_KERNEL);

		if (!msg_mask->ptr)

			return -ENOMEM;

		kmemleak_not_leak(msg_mask->ptr);

	}

	return 0;

}
@@ -1193,6 +1194,7 @@ static int diag_create_log_mask_table(void) 
			err = -ENOMEM;

			break;

		}

		kmemleak_not_leak(mask->ptr);

	}

	mutex_unlock(&log_mask.lock);

	return err;

drivers/char/diag/diag_mux.c

+1 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ int diag_mux_init() 
			 GFP_KERNEL);

	if (!logger)

		return -ENOMEM;

	kmemleak_not_leak(logger);



	usb_logger.mode = DIAG_USB_MODE;

	usb_logger.log_ops = &usb_log_ops;

drivers/char/diag/diagfwd_mhi.c

+1 −0
Original line number Diff line number Diff line
@@ -137,6 +137,7 @@ static int mhi_buf_tbl_add(struct diag_mhi_info *mhi_info, int type, 
				   __func__, ch, ch->type, buf, len);

		return -ENOMEM;

	}

	kmemleak_not_leak(item);



	spin_lock_irqsave(&ch->lock, flags);

	item->buf = buf;