DivestOS/Patches/Linux_CVEs/CVE-2017-0452/ANY/0.patch.dupe

37 lines
1.1 KiB
Plaintext
Raw Normal View History

2017-10-29 22:14:37 -04:00
diff --git a/drivers/media/platform/msm/vidc/msm_vidc.c b/drivers/media/platform/msm/vidc/msm_vidc.c
index 0f55f32..b90ebc1 100644
--- a/drivers/media/platform/msm/vidc/msm_vidc.c
+++ b/drivers/media/platform/msm/vidc/msm_vidc.c
@@ -1405,7 +1405,8 @@
debugfs_remove_recursive(inst->debugfs_root);
mutex_lock(&inst->pending_getpropq.lock);
- WARN_ON(!list_empty(&inst->pending_getpropq.list));
+ WARN_ON(!list_empty(&inst->pending_getpropq.list)
+ && (msm_vidc_debug & VIDC_INFO));
mutex_unlock(&inst->pending_getpropq.lock);
}
}
diff --git a/drivers/media/platform/msm/vidc/venus_hfi.c b/drivers/media/platform/msm/vidc/venus_hfi.c
index a7a391f..6f6d79a 100644
--- a/drivers/media/platform/msm/vidc/venus_hfi.c
+++ b/drivers/media/platform/msm/vidc/venus_hfi.c
@@ -261,7 +261,7 @@
rinfo->name);
}
}
- WARN_ON(!regulator_is_enabled(rinfo->regulator));
+ WARN_ON(!regulator_is_enabled(rinfo->regulator) && (msm_vidc_debug & VIDC_INFO));
return rc;
}
@@ -3954,7 +3954,7 @@
disable_regulator_failed:
/* Bring attention to this issue */
- WARN_ON(1);
+ WARN_ON(msm_vidc_debug & VIDC_INFO);
return rc;
}