bxe: fix copyin/copyout Signed-off-by: Ron Minnich <rminnich@gmail.com>
diff --git a/kern/drivers/net/bxe/bxe.c b/kern/drivers/net/bxe/bxe.c index 4a21e69..3cf5b40 100644 --- a/kern/drivers/net/bxe/bxe.c +++ b/kern/drivers/net/bxe/bxe.c
@@ -4538,7 +4538,7 @@ int len; int error = 0; - copyin(data, &nvdata_base, sizeof(nvdata_base)); + memcpy_from_user(current, &nvdata_base, data, sizeof(nvdata_base)); len = (sizeof(struct bxe_nvram_data) + nvdata_base.len - @@ -4562,11 +4562,11 @@ nvdata->offset, (uint8_t *)nvdata->value, nvdata->len); - copyout(nvdata, data, len); + memcpy_to_user(current, data, nvdata, len); } else { /* BXE_IOC_WR_NVRAM */ BLOGD(sc, DBG_IOCTL, "IOC_WR_NVRAM 0x%x %d\n", nvdata->offset, nvdata->len); - copyin(data, nvdata, len); + memcpy_from_user(current, nvdata, data, len); error = bxe_nvram_write(sc, nvdata->offset, (uint8_t *)nvdata->value,
diff --git a/kern/drivers/net/bxe/bxe.h b/kern/drivers/net/bxe/bxe.h index 93c4061..b792430 100644 --- a/kern/drivers/net/bxe/bxe.h +++ b/kern/drivers/net/bxe/bxe.h
@@ -42,6 +42,7 @@ #include <bitmap.h> #include <taskqueue.h> #include <mii.h> +#include <umem.h> /* MACROS for conversion to AKAROS. Might we want this stuff someday? */