aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Johnston <markj@FreeBSD.org>2021-07-16 02:39:27 +0000
committerMark Johnston <markj@FreeBSD.org>2021-07-23 11:49:31 +0000
commit51095d36de449526a80da6ca859185a0107a497f (patch)
treef3bbaff644a3bbc436afff4baeeb6dc4c120e58a
parent572e3575dba591f372633a38d76ce7904d1a1b2e (diff)
downloadsrc-51095d36de449526a80da6ca859185a0107a497f.tar.gz
src-51095d36de449526a80da6ca859185a0107a497f.zip
nfssvc: Zero the buffer copied out when NFSSVC_DUMPMNTOPTS is set
Reported by: KMSAN Sponsored by: The FreeBSD Foundation (cherry picked from commit 7a9bc8a82ec20f9208643f1615ea4ca1d0e5d933)
-rw-r--r--sys/fs/nfsclient/nfs_clport.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/fs/nfsclient/nfs_clport.c b/sys/fs/nfsclient/nfs_clport.c
index 264d99626394..6364cce6626c 100644
--- a/sys/fs/nfsclient/nfs_clport.c
+++ b/sys/fs/nfsclient/nfs_clport.c
@@ -1312,7 +1312,8 @@ nfssvc_nfscl(struct thread *td, struct nfssvc_args *uap)
error = EINVAL;
}
if (error == 0) {
- buf = malloc(dumpmntopts.ndmnt_blen, M_TEMP, M_WAITOK);
+ buf = malloc(dumpmntopts.ndmnt_blen, M_TEMP, M_WAITOK |
+ M_ZERO);
nfscl_retopts(VFSTONFS(nd.ni_vp->v_mount), buf,
dumpmntopts.ndmnt_blen);
vput(nd.ni_vp);