[src/trunk]: src/sys/external/bsd/libnv/dist nvlist_copyin: fix the flag hand...

[rmind <rmind%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/e391b596d6e5
branches:  trunk
changeset: 836045:e391b596d6e5
user:      rmind <rmind%NetBSD.org@localhost>
date:      Sun Sep 23 21:35:26 2018 +0000

description:
nvlist_copyin: fix the flag handling.

diffstat:

 sys/external/bsd/libnv/dist/nv_kern_netbsd.c |  11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diffs (48 lines):

diff -r fdf5560844b5 -r e391b596d6e5 sys/external/bsd/libnv/dist/nv_kern_netbsd.c
--- a/sys/external/bsd/libnv/dist/nv_kern_netbsd.c      Sun Sep 23 21:18:30 2018 +0000
+++ b/sys/external/bsd/libnv/dist/nv_kern_netbsd.c      Sun Sep 23 21:35:26 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nv_kern_netbsd.c,v 1.4 2018/09/23 19:07:10 rmind Exp $ */
+/*     $NetBSD: nv_kern_netbsd.c,v 1.5 2018/09/23 21:35:26 rmind Exp $ */
 
 /*-
  * Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: nv_kern_netbsd.c,v 1.4 2018/09/23 19:07:10 rmind Exp $");
+__RCSID("$NetBSD: nv_kern_netbsd.c,v 1.5 2018/09/23 21:35:26 rmind Exp $");
 
 #if !defined(_KERNEL) && !defined(_STANDALONE)
 #include <sys/mman.h>
@@ -74,9 +74,9 @@
 nvlist_copyin(const nvlist_ref_t *nref, nvlist_t **nvlp, size_t lim)
 {
        const size_t len = nref->len;
+       int flags, error;
        nvlist_t *nvl;
        void *buf;
-       int error;
 
        if (len >= lim) {
                return E2BIG;
@@ -87,7 +87,8 @@
                kmem_free(buf, len);
                return error;
        }
-       nvl = nvlist_unpack(buf, len, nref->flags);
+       flags = nref->flags & (NV_FLAG_IGNORE_CASE | NV_FLAG_NO_UNIQUE);
+       nvl = nvlist_unpack(buf, len, flags);
        kmem_free(buf, len);
        if (nvl == NULL) {
                return EINVAL;
@@ -126,7 +127,7 @@
                    (vaddr_t)uaddr + len);
                goto err;
        }
-       nref->flags = nvlist_error(nvl);
+       nref->flags = nvlist_flags(nvl);
        nref->buf = uaddr;
        nref->len = len;
 err: