aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon J. Gerraty <sjg@FreeBSD.org>2023-07-06 16:26:15 +0000
committerSimon J. Gerraty <sjg@FreeBSD.org>2023-07-06 16:26:15 +0000
commit6eabf4ce35ec1c79ab9a9dbe70ac934d62d2cd5d (patch)
tree11f22309bbe6b3bf22bddc814ec86863570c349a
parentb8f51b8c5423af0795429836a00f2a968e791f6e (diff)
downloadsrc-6eabf4ce35ec1c79ab9a9dbe70ac934d62d2cd5d.tar.gz
src-6eabf4ce35ec1c79ab9a9dbe70ac934d62d2cd5d.zip
mac_veriexec ensure label fields are initialized
Obtained from: bkumara@juniper.net
-rw-r--r--sys/security/mac_veriexec/veriexec_metadata.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/sys/security/mac_veriexec/veriexec_metadata.c b/sys/security/mac_veriexec/veriexec_metadata.c
index 4e25b1672575..b0491bde7d16 100644
--- a/sys/security/mac_veriexec/veriexec_metadata.c
+++ b/sys/security/mac_veriexec/veriexec_metadata.c
@@ -732,14 +732,12 @@ search:
ip->ops = fpops;
ip->fileid = fileid;
ip->gen = gen;
+ ip->label = NULL;
+ ip->labellen = 0;
memcpy(ip->fingerprint, fingerprint, fpops->digest_len);
if (flags & VERIEXEC_LABEL)
ip->labellen = mac_veriexec_init_label(&ip->label,
ip->labellen, label, labellen);
- else {
- ip->label = NULL;
- ip->labellen = 0;
- }
VERIEXEC_DEBUG(3, ("add file %ju.%lu (files=%d)\n",
(uintmax_t)ip->fileid,