Michael S. Tsirkin
2010-Apr-13 15:01 UTC
[PATCH] vhost-net: fix vq_memory_access_ok error checking
On Wed, Apr 07, 2010 at 09:59:10AM -0400, Jeff Dike wrote:> vq_memory_access_ok needs to check whether mem == NULL > > Signed-off-by: Jeff Dike <jdike at linux.intel.com> > Signed-off-by: Michael S. Tsirkin <mst at redhat.com>This was already queued by me, you do not need to fill Dave's inbox with vhost patches.> --- > drivers/vhost/vhost.c | 4 ++++ > 1 files changed, 4 insertions(+), 0 deletions(-) > > diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c > index 7bd7a1e..b8e1127 100644 > --- a/drivers/vhost/vhost.c > +++ b/drivers/vhost/vhost.c > @@ -235,6 +235,10 @@ static int vq_memory_access_ok(void __user *log_base, struct vhost_memory *mem, > int log_all) > { > int i; > + > + if (!mem) > + return 0; > + > for (i = 0; i < mem->nregions; ++i) { > struct vhost_memory_region *m = mem->regions + i; > unsigned long a = m->userspace_addr; > -- > 1.7.0.2.280.gc6f05
Michael S. Tsirkin
2010-Apr-13 15:02 UTC
[PATCH] vhost-net: fix vq_memory_access_ok error checking
On Tue, Apr 13, 2010 at 06:01:21PM +0300, Michael S. Tsirkin wrote:> On Wed, Apr 07, 2010 at 09:59:10AM -0400, Jeff Dike wrote: > > vq_memory_access_ok needs to check whether mem == NULL > > > > Signed-off-by: Jeff Dike <jdike at linux.intel.com> > > Signed-off-by: Michael S. Tsirkin <mst at redhat.com> > > This was already queued by me, you do not need to > fill Dave's inbox with vhost patches.This was sent in error, please ignore. Sorry about the noise.> > --- > > drivers/vhost/vhost.c | 4 ++++ > > 1 files changed, 4 insertions(+), 0 deletions(-) > > > > diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c > > index 7bd7a1e..b8e1127 100644 > > --- a/drivers/vhost/vhost.c > > +++ b/drivers/vhost/vhost.c > > @@ -235,6 +235,10 @@ static int vq_memory_access_ok(void __user *log_base, struct vhost_memory *mem, > > int log_all) > > { > > int i; > > + > > + if (!mem) > > + return 0; > > + > > for (i = 0; i < mem->nregions; ++i) { > > struct vhost_memory_region *m = mem->regions + i; > > unsigned long a = m->userspace_addr; > > -- > > 1.7.0.2.280.gc6f05