diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index f728efb285d3b9d99bb300cd0485f1f3619a2cdf..6119a08899fde4594e005a29af85b50dd47d7fe2 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -1768,9 +1768,10 @@ int hid_report_raw_event(struct hid_device *hid, int type, u8 *data, u32 size,
 		rsize = HID_MAX_BUFFER_SIZE;
 
 	if (csize < rsize) {
-		dbg_hid("report %d is too short, (%d < %d)\n", report->id,
-				csize, rsize);
-		memset(cdata + csize, 0, rsize - csize);
+		hid_warn_ratelimited(hid, "Event data for report %d was too short (%d vs %d)\n",
+				     report->id, rsize, csize);
+		ret = -EINVAL;
+		goto out;
 	}
 
 	if ((hid->claimed & HID_CLAIMED_HIDDEV) && hid->hiddev_report_event)