Module Name: src
Committed By: riastradh
Date: Sun Mar 8 23:37:56 UTC 2015
Modified Files:
src/sys/external/bsd/drm2/drm: drm_drv.c
Log Message:
Don't return events that are too large and leave them in the list.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/external/bsd/drm2/drm/drm_drv.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/drm/drm_drv.c
diff -u src/sys/external/bsd/drm2/drm/drm_drv.c:1.14 src/sys/external/bsd/drm2/drm/drm_drv.c:1.15
--- src/sys/external/bsd/drm2/drm/drm_drv.c:1.14 Fri Mar 6 14:02:39 2015
+++ src/sys/external/bsd/drm2/drm/drm_drv.c Sun Mar 8 23:37:56 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_drv.c,v 1.14 2015/03/06 14:02:39 riastradh Exp $ */
+/* $NetBSD: drm_drv.c,v 1.15 2015/03/08 23:37:56 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_drv.c,v 1.14 2015/03/06 14:02:39 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_drv.c,v 1.15 2015/03/08 23:37:56 riastradh Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -469,6 +469,8 @@ drm_dequeue_event(struct drm_file *file,
event = list_first_entry(&file->event_list, struct drm_pending_event,
link);
if (event->event->length > max_length) {
+ /* Event is too large, can't return it. */
+ event = NULL;
ret = 0;
goto out;
}
