From af8f930405de6c36d84228668838499b196aeeab Mon Sep 17 00:00:00 2001 From: christos Date: Fri, 4 Mar 2011 01:36:56 +0000 Subject: [PATCH] PR/44674: Taylor R Campbell: Fix compat copyin and copyout routines which were obviously broken. --- sys/compat/common/kern_time_50.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/sys/compat/common/kern_time_50.c b/sys/compat/common/kern_time_50.c index 1413df7c0ce0..0e77101ada92 100644 --- a/sys/compat/common/kern_time_50.c +++ b/sys/compat/common/kern_time_50.c @@ -1,4 +1,4 @@ -/* $NetBSD: kern_time_50.c,v 1.18 2011/01/19 10:21:16 tsutsui Exp $ */ +/* $NetBSD: kern_time_50.c,v 1.19 2011/03/04 01:36:56 christos Exp $ */ /*- * Copyright (c) 2008, 2009 The NetBSD Foundation, Inc. @@ -29,7 +29,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include -__KERNEL_RCSID(0, "$NetBSD: kern_time_50.c,v 1.18 2011/01/19 10:21:16 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: kern_time_50.c,v 1.19 2011/03/04 01:36:56 christos Exp $"); #ifdef _KERNEL_OPT #include "opt_aio.h" @@ -453,8 +453,10 @@ static int tscopyin(const void *u, void *s, size_t len) { struct timespec50 ts50; - KASSERT(len == sizeof(ts50)); - int error = copyin(u, &ts50, len); + int error; + + KASSERT(len == sizeof(struct timespec)); + error = copyin(u, &ts50, sizeof(ts50)); if (error) return error; timespec50_to_timespec(&ts50, s); @@ -465,12 +467,10 @@ static int tscopyout(const void *s, void *u, size_t len) { struct timespec50 ts50; - KASSERT(len == sizeof(ts50)); + + KASSERT(len == sizeof(struct timespec)); timespec_to_timespec50(s, &ts50); - int error = copyout(&ts50, u, len); - if (error) - return error; - return 0; + return copyout(&ts50, u, sizeof(ts50)); } int