Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-7]: src/sys/arch/xen/xen Pull up following revision(s) (requested...
details: https://anonhg.NetBSD.org/src/rev/6a9f284bac72
branches: netbsd-7
changeset: 799362:6a9f284bac72
user: snj <snj%NetBSD.org@localhost>
date: Fri May 22 16:56:45 2015 +0000
description:
Pull up following revision(s) (requested by bouyer in ticket #796):
sys/arch/xen/xen/xenevt.c: revision 1.42
Fix off by one error, pointed out by Wei Liu in port-xen/49919
diffstat:
sys/arch/xen/xen/xenevt.c | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diffs (45 lines):
diff -r 77526e723159 -r 6a9f284bac72 sys/arch/xen/xen/xenevt.c
--- a/sys/arch/xen/xen/xenevt.c Fri May 22 16:53:32 2015 +0000
+++ b/sys/arch/xen/xen/xenevt.c Fri May 22 16:56:45 2015 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: xenevt.c,v 1.41 2014/07/25 08:10:35 dholland Exp $ */
+/* $NetBSD: xenevt.c,v 1.41.2.1 2015/05/22 16:56:45 snj Exp $ */
/*
* Copyright (c) 2005 Manuel Bouyer.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xenevt.c,v 1.41 2014/07/25 08:10:35 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xenevt.c,v 1.41.2.1 2015/05/22 16:56:45 snj Exp $");
#include "opt_xen.h"
#include <sys/param.h>
@@ -489,7 +489,7 @@
if (uio->uio_resid == 0)
return (0);
nentries = uio->uio_resid / sizeof(uint16_t);
- if (nentries > NR_EVENT_CHANNELS)
+ if (nentries >= NR_EVENT_CHANNELS)
return EMSGSIZE;
chans = kmem_alloc(nentries * sizeof(uint16_t), KM_SLEEP);
if (chans == NULL)
@@ -582,7 +582,7 @@
{
struct ioctl_evtchn_unbind *unbind = addr;
- if (unbind->port > NR_EVENT_CHANNELS)
+ if (unbind->port >= NR_EVENT_CHANNELS)
return EINVAL;
mutex_enter(&devevent_lock);
if (devevent[unbind->port] != d) {
@@ -603,7 +603,7 @@
{
struct ioctl_evtchn_notify *notify = addr;
- if (notify->port > NR_EVENT_CHANNELS)
+ if (notify->port >= NR_EVENT_CHANNELS)
return EINVAL;
mutex_enter(&devevent_lock);
if (devevent[notify->port] != d) {
Home |
Main Index |
Thread Index |
Old Index