diff --git a/arch/arm64/kvm/hyp_events.c b/arch/arm64/kvm/hyp_events.c
index d47dafe75214..ac300f5b46f5 100644
--- a/arch/arm64/kvm/hyp_events.c
+++ b/arch/arm64/kvm/hyp_events.c
@@ -128,7 +128,7 @@ hyp_event_write(struct file *filp, const char __user *ubuf, size_t cnt, loff_t *
 	int ret;
 	char c;
 
-	if (cnt != 2)
+	if (!cnt || cnt > 2)
 		return -EINVAL;
 
 	if (get_user(c, ubuf))
diff --git a/arch/arm64/kvm/hyp_trace.c b/arch/arm64/kvm/hyp_trace.c
index 02adc98dffbe..bfdfdeeb7db1 100644
--- a/arch/arm64/kvm/hyp_trace.c
+++ b/arch/arm64/kvm/hyp_trace.c
@@ -306,7 +306,7 @@ hyp_tracing_on(struct file *filp, const char __user *ubuf, size_t cnt, loff_t *p
 	int err = 0;
 	char c;
 
-	if (cnt != 2)
+	if (!cnt || cnt > 2)
 		return -EINVAL;
 
 	if (get_user(c, ubuf))