Module Name: src
Committed By: macallan
Date: Sat Oct 4 13:05:57 UTC 2014
Modified Files:
src/sys/arch/evbarm/rpi: rpi_machdep.c
Log Message:
pay attention to copyin()'s return values
To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 src/sys/arch/evbarm/rpi/rpi_machdep.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/arch/evbarm/rpi/rpi_machdep.c
diff -u src/sys/arch/evbarm/rpi/rpi_machdep.c:1.53 src/sys/arch/evbarm/rpi/rpi_machdep.c:1.54
--- src/sys/arch/evbarm/rpi/rpi_machdep.c:1.53 Fri Oct 3 11:40:55 2014
+++ src/sys/arch/evbarm/rpi/rpi_machdep.c Sat Oct 4 13:05:57 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: rpi_machdep.c,v 1.53 2014/10/03 11:40:55 skrll Exp $ */
+/* $NetBSD: rpi_machdep.c,v 1.54 2014/10/04 13:05:57 macallan Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rpi_machdep.c,v 1.53 2014/10/03 11:40:55 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rpi_machdep.c,v 1.54 2014/10/04 13:05:57 macallan Exp $");
#include "opt_evbarm_boardtype.h"
#include "opt_ddb.h"
@@ -911,9 +911,12 @@ rpi_fb_do_cursor(struct wsdisplay_cursor
shape = 1;
}
if (cur->which & WSDISPLAY_CURSOR_DOSHAPE) {
+ int err;
- copyin(cur->mask, cursor_mask, CURSOR_BITMAP_SIZE);
- copyin(cur->image, cursor_bitmap, CURSOR_BITMAP_SIZE);
+ err = copyin(cur->mask, cursor_mask, CURSOR_BITMAP_SIZE);
+ err += copyin(cur->image, cursor_bitmap, CURSOR_BITMAP_SIZE);
+ if (err != 0)
+ return EFAULT;
shape = 1;
}
if (shape) {
