Merge "msm: camera: isp: Validate packet op-code while checking last flush... (adc794c4) · Commits · e / devices / android_kernel_xiaomi_nabu

drivers/media/platform/msm/camera/cam_isp/cam_isp_context.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -2235,7 +2235,8 @@ static int __cam_isp_ctx_config_dev_in_top_state(
		CAM_DBG(CAM_ISP, "Packet size 0x%x", packet->header.size);
		CAM_DBG(CAM_ISP, "packet op %d", packet->header.op_code);

		if (packet->header.request_id <= ctx->last_flush_req) {
		if ((((packet->header.op_code + 1) & 0xF) == CAM_ISP_PACKET_UPDATE_DEV)
		&& (packet->header.request_id <= ctx->last_flush_req)) {
		CAM_INFO(CAM_ISP,
		"request %lld has been flushed, reject packet",
		packet->header.request_id);