From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7B7A3C43613 for ; Sat, 22 Jun 2019 23:15:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3A2EE206B7 for ; Sat, 22 Jun 2019 23:15:08 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="JcjcUKlB" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726414AbfFVXPH (ORCPT ); Sat, 22 Jun 2019 19:15:07 -0400 Received: from mail-pg1-f196.google.com ([209.85.215.196]:46262 "EHLO mail-pg1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726365AbfFVXPH (ORCPT ); Sat, 22 Jun 2019 19:15:07 -0400 Received: by mail-pg1-f196.google.com with SMTP id v9so5068207pgr.13 for ; Sat, 22 Jun 2019 16:15:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=PuR+lnsm/8SMC8+Z5x3KzNuWxdWIgkbiUXwFAhoZOxA=; b=JcjcUKlBN0sG21/0WCiHxNq0W5A9ODCbepAKQuNXwt7xQ2emhEf3ZzNhR5/RvpxWbZ MxVqYKez9tHwzX9MV2M4XPSUYzMVOHYLo2NPZhxYa8wRozOr5qA6oaL/pM7PGDbA/2rv xDFroAhY0UNmS6WZ4FvKwI9ZKnMGYKr+cDFfY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=PuR+lnsm/8SMC8+Z5x3KzNuWxdWIgkbiUXwFAhoZOxA=; b=HvCb9wjtpJuZPX+j/14nGSzM4/yNFd6zSPqiIDRXwB82vNJk2uKV7BhhzbymThcne2 vWvGXgPJTEqY1xK+BbbaJfKNs1nvq49c2+w7VGwx2AndjAMHV97oesgpotvuEComL9fv l69h6UNIkQbVxvVpQJ/1ORRBm1CysTGmQTyyqz6g8UOZSocjARVoFX7VXOKBn0FuOOuN 4Pcg2NoE2e4oopZ6GWNyNfUiCIxXVks1ADPohm9sL+2nfIsKs0zNrQeRxbWlImmv9HC6 iPCIzVHyystJKC+dD2LBHoSHdHyqA0nuRsM4Aa/mEOCblKVDNrXox06MsWWP6MP8OwIO Vyog== X-Gm-Message-State: APjAAAVQLoECQsn8H/3XegK65utbOsjJr+pUjGujNRwFLJ007F5Qw3F2 Zo93jp0thzdI2w+I3kPL3dg5xw== X-Google-Smtp-Source: APXvYqz2KfXj5lyCJ+hegOl2OTXInAUQbZBv+sOONAF8TDVl/SQtrfrY9Io5fKx0hLQbmbjUPL2ARg== X-Received: by 2002:a17:90a:19d:: with SMTP id 29mr15803543pjc.71.1561245306131; Sat, 22 Jun 2019 16:15:06 -0700 (PDT) Received: from www.outflux.net (smtp.outflux.net. [198.145.64.163]) by smtp.gmail.com with ESMTPSA id u16sm7660212pjb.2.2019.06.22.16.15.05 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 22 Jun 2019 16:15:05 -0700 (PDT) Date: Sat, 22 Jun 2019 16:15:04 -0700 From: Kees Cook To: Casey Schaufler Cc: casey.schaufler@intel.com, jmorris@namei.org, linux-security-module@vger.kernel.org, selinux@vger.kernel.org, john.johansen@canonical.com, penguin-kernel@i-love.sakura.ne.jp, paul@paul-moore.com, sds@tycho.nsa.gov Subject: Re: [PATCH v3 23/24] NET: Store LSM netlabel data in a lsmblob Message-ID: <201906221615.6005C9ED@keescook> References: <20190621185233.6766-1-casey@schaufler-ca.com> <20190621185233.6766-24-casey@schaufler-ca.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190621185233.6766-24-casey@schaufler-ca.com> Sender: owner-linux-security-module@vger.kernel.org Precedence: bulk List-ID: On Fri, Jun 21, 2019 at 11:52:32AM -0700, Casey Schaufler wrote: > Netlabel uses LSM interfaces requiring an lsmblob and > the internal storage is used to pass information between > these interfaces, so change the internal data from a secid > to a lsmblob. Update the netlabel interfaces and their > callers to accomodate the change. > > Signed-off-by: Casey Schaufler Reviewed-by: Kees Cook -Kees > --- > include/net/netlabel.h | 8 ++-- > net/ipv4/cipso_ipv4.c | 6 ++- > net/netlabel/netlabel_kapi.c | 6 +-- > net/netlabel/netlabel_unlabeled.c | 57 +++++++++++------------------ > net/netlabel/netlabel_unlabeled.h | 2 +- > security/selinux/include/security.h | 1 + > security/selinux/netlabel.c | 2 +- > security/selinux/ss/services.c | 4 +- > security/smack/smack.h | 1 + > security/smack/smack_lsm.c | 3 +- > security/smack/smackfs.c | 10 +++-- > 11 files changed, 48 insertions(+), 52 deletions(-) > > diff --git a/include/net/netlabel.h b/include/net/netlabel.h > index 72d6435fc16c..6c550455e69f 100644 > --- a/include/net/netlabel.h > +++ b/include/net/netlabel.h > @@ -180,7 +180,7 @@ struct netlbl_lsm_catmap { > * @attr.mls: MLS sensitivity label > * @attr.mls.cat: MLS category bitmap > * @attr.mls.lvl: MLS sensitivity level > - * @attr.secid: LSM specific secid token > + * @attr.lsmblob: LSM specific data > * > * Description: > * This structure is used to pass security attributes between NetLabel and the > @@ -215,7 +215,7 @@ struct netlbl_lsm_secattr { > struct netlbl_lsm_catmap *cat; > u32 lvl; > } mls; > - u32 secid; > + struct lsmblob lsmblob; > } attr; > }; > > @@ -429,7 +429,7 @@ int netlbl_cfg_unlbl_static_add(struct net *net, > const void *addr, > const void *mask, > u16 family, > - u32 secid, > + struct lsmblob *lsmblob, > struct netlbl_audit *audit_info); > int netlbl_cfg_unlbl_static_del(struct net *net, > const char *dev_name, > @@ -537,7 +537,7 @@ static inline int netlbl_cfg_unlbl_static_add(struct net *net, > const void *addr, > const void *mask, > u16 family, > - u32 secid, > + struct lsmblob *lsmblob, > struct netlbl_audit *audit_info) > { > return -ENOSYS; > diff --git a/net/ipv4/cipso_ipv4.c b/net/ipv4/cipso_ipv4.c > index f0165c5f376b..eb4939f38a14 100644 > --- a/net/ipv4/cipso_ipv4.c > +++ b/net/ipv4/cipso_ipv4.c > @@ -1481,7 +1481,8 @@ static int cipso_v4_gentag_loc(const struct cipso_v4_doi *doi_def, > > buffer[0] = CIPSO_V4_TAG_LOCAL; > buffer[1] = CIPSO_V4_TAG_LOC_BLEN; > - *(u32 *)&buffer[2] = secattr->attr.secid; > + /* only one netlabel user - the first */ > + *(u32 *)&buffer[2] = secattr->attr.lsmblob.secid[0]; > > return CIPSO_V4_TAG_LOC_BLEN; > } > @@ -1501,7 +1502,8 @@ static int cipso_v4_parsetag_loc(const struct cipso_v4_doi *doi_def, > const unsigned char *tag, > struct netlbl_lsm_secattr *secattr) > { > - secattr->attr.secid = *(u32 *)&tag[2]; > + /* only one netlabel user - the first */ > + secattr->attr.lsmblob.secid[0] = *(u32 *)&tag[2]; > secattr->flags |= NETLBL_SECATTR_SECID; > > return 0; > diff --git a/net/netlabel/netlabel_kapi.c b/net/netlabel/netlabel_kapi.c > index ee3e5b6471a6..724d44943543 100644 > --- a/net/netlabel/netlabel_kapi.c > +++ b/net/netlabel/netlabel_kapi.c > @@ -210,7 +210,7 @@ int netlbl_cfg_unlbl_map_add(const char *domain, > * @addr: IP address in network byte order (struct in[6]_addr) > * @mask: address mask in network byte order (struct in[6]_addr) > * @family: address family > - * @secid: LSM secid value for the entry > + * @lsmblob: LSM data value for the entry > * @audit_info: NetLabel audit information > * > * Description: > @@ -224,7 +224,7 @@ int netlbl_cfg_unlbl_static_add(struct net *net, > const void *addr, > const void *mask, > u16 family, > - u32 secid, > + struct lsmblob *lsmblob, > struct netlbl_audit *audit_info) > { > u32 addr_len; > @@ -244,7 +244,7 @@ int netlbl_cfg_unlbl_static_add(struct net *net, > > return netlbl_unlhsh_add(net, > dev_name, addr, mask, addr_len, > - secid, audit_info); > + lsmblob, audit_info); > } > > /** > diff --git a/net/netlabel/netlabel_unlabeled.c b/net/netlabel/netlabel_unlabeled.c > index 4716e0011ba5..57ede7781c8f 100644 > --- a/net/netlabel/netlabel_unlabeled.c > +++ b/net/netlabel/netlabel_unlabeled.c > @@ -80,7 +80,7 @@ struct netlbl_unlhsh_tbl { > #define netlbl_unlhsh_addr4_entry(iter) \ > container_of(iter, struct netlbl_unlhsh_addr4, list) > struct netlbl_unlhsh_addr4 { > - u32 secid; > + struct lsmblob lsmblob; > > struct netlbl_af4list list; > struct rcu_head rcu; > @@ -88,7 +88,7 @@ struct netlbl_unlhsh_addr4 { > #define netlbl_unlhsh_addr6_entry(iter) \ > container_of(iter, struct netlbl_unlhsh_addr6, list) > struct netlbl_unlhsh_addr6 { > - u32 secid; > + struct lsmblob lsmblob; > > struct netlbl_af6list list; > struct rcu_head rcu; > @@ -233,7 +233,7 @@ static struct netlbl_unlhsh_iface *netlbl_unlhsh_search_iface(int ifindex) > * @iface: the associated interface entry > * @addr: IPv4 address in network byte order > * @mask: IPv4 address mask in network byte order > - * @secid: LSM secid value for entry > + * @lsmblob: LSM data value for entry > * > * Description: > * Add a new address entry into the unlabeled connection hash table using the > @@ -244,7 +244,7 @@ static struct netlbl_unlhsh_iface *netlbl_unlhsh_search_iface(int ifindex) > static int netlbl_unlhsh_add_addr4(struct netlbl_unlhsh_iface *iface, > const struct in_addr *addr, > const struct in_addr *mask, > - u32 secid) > + struct lsmblob *lsmblob) > { > int ret_val; > struct netlbl_unlhsh_addr4 *entry; > @@ -256,7 +256,7 @@ static int netlbl_unlhsh_add_addr4(struct netlbl_unlhsh_iface *iface, > entry->list.addr = addr->s_addr & mask->s_addr; > entry->list.mask = mask->s_addr; > entry->list.valid = 1; > - entry->secid = secid; > + entry->lsmblob = *lsmblob; > > spin_lock(&netlbl_unlhsh_lock); > ret_val = netlbl_af4list_add(&entry->list, &iface->addr4_list); > @@ -273,7 +273,7 @@ static int netlbl_unlhsh_add_addr4(struct netlbl_unlhsh_iface *iface, > * @iface: the associated interface entry > * @addr: IPv6 address in network byte order > * @mask: IPv6 address mask in network byte order > - * @secid: LSM secid value for entry > + * @lsmblob: LSM data value for entry > * > * Description: > * Add a new address entry into the unlabeled connection hash table using the > @@ -284,7 +284,7 @@ static int netlbl_unlhsh_add_addr4(struct netlbl_unlhsh_iface *iface, > static int netlbl_unlhsh_add_addr6(struct netlbl_unlhsh_iface *iface, > const struct in6_addr *addr, > const struct in6_addr *mask, > - u32 secid) > + struct lsmblob *lsmblob) > { > int ret_val; > struct netlbl_unlhsh_addr6 *entry; > @@ -300,7 +300,7 @@ static int netlbl_unlhsh_add_addr6(struct netlbl_unlhsh_iface *iface, > entry->list.addr.s6_addr32[3] &= mask->s6_addr32[3]; > entry->list.mask = *mask; > entry->list.valid = 1; > - entry->secid = secid; > + entry->lsmblob = *lsmblob; > > spin_lock(&netlbl_unlhsh_lock); > ret_val = netlbl_af6list_add(&entry->list, &iface->addr6_list); > @@ -379,7 +379,7 @@ int netlbl_unlhsh_add(struct net *net, > const void *addr, > const void *mask, > u32 addr_len, > - u32 secid, > + struct lsmblob *lsmblob, > struct netlbl_audit *audit_info) > { > int ret_val; > @@ -388,7 +388,6 @@ int netlbl_unlhsh_add(struct net *net, > struct netlbl_unlhsh_iface *iface; > struct audit_buffer *audit_buf = NULL; > struct lsmcontext context; > - struct lsmblob blob; > > if (addr_len != sizeof(struct in_addr) && > addr_len != sizeof(struct in6_addr)) > @@ -421,7 +420,7 @@ int netlbl_unlhsh_add(struct net *net, > const struct in_addr *addr4 = addr; > const struct in_addr *mask4 = mask; > > - ret_val = netlbl_unlhsh_add_addr4(iface, addr4, mask4, secid); > + ret_val = netlbl_unlhsh_add_addr4(iface, addr4, mask4, lsmblob); > if (audit_buf != NULL) > netlbl_af4list_audit_addr(audit_buf, 1, > dev_name, > @@ -434,7 +433,7 @@ int netlbl_unlhsh_add(struct net *net, > const struct in6_addr *addr6 = addr; > const struct in6_addr *mask6 = mask; > > - ret_val = netlbl_unlhsh_add_addr6(iface, addr6, mask6, secid); > + ret_val = netlbl_unlhsh_add_addr6(iface, addr6, mask6, lsmblob); > if (audit_buf != NULL) > netlbl_af6list_audit_addr(audit_buf, 1, > dev_name, > @@ -451,8 +450,7 @@ int netlbl_unlhsh_add(struct net *net, > unlhsh_add_return: > rcu_read_unlock(); > if (audit_buf != NULL) { > - lsmblob_init(&blob, secid); > - if (security_secid_to_secctx(&blob, &context) == 0) { > + if (security_secid_to_secctx(lsmblob, &context) == 0) { > audit_log_format(audit_buf, " sec_obj=%s", > context.context); > security_release_secctx(&context); > @@ -487,7 +485,6 @@ static int netlbl_unlhsh_remove_addr4(struct net *net, > struct audit_buffer *audit_buf; > struct net_device *dev; > struct lsmcontext context; > - struct lsmblob blob; > > spin_lock(&netlbl_unlhsh_lock); > list_entry = netlbl_af4list_remove(addr->s_addr, mask->s_addr, > @@ -507,10 +504,8 @@ static int netlbl_unlhsh_remove_addr4(struct net *net, > addr->s_addr, mask->s_addr); > if (dev != NULL) > dev_put(dev); > - if (entry != NULL) > - lsmblob_init(&blob, entry->secid); > if (entry != NULL && > - security_secid_to_secctx(&blob, &context) == 0) { > + security_secid_to_secctx(&entry->lsmblob, &context) == 0) { > audit_log_format(audit_buf, " sec_obj=%s", > context.context); > security_release_secctx(&context); > @@ -551,7 +546,6 @@ static int netlbl_unlhsh_remove_addr6(struct net *net, > struct audit_buffer *audit_buf; > struct net_device *dev; > struct lsmcontext context; > - struct lsmblob blob; > > spin_lock(&netlbl_unlhsh_lock); > list_entry = netlbl_af6list_remove(addr, mask, &iface->addr6_list); > @@ -570,10 +564,8 @@ static int netlbl_unlhsh_remove_addr6(struct net *net, > addr, mask); > if (dev != NULL) > dev_put(dev); > - if (entry != NULL) > - lsmblob_init(&blob, entry->secid); > if (entry != NULL && > - security_secid_to_secctx(&blob, &context) == 0) { > + security_secid_to_secctx(&entry->lsmblob, &context) == 0) { > audit_log_format(audit_buf, " sec_obj=%s", > context.context); > security_release_secctx(&context); > @@ -927,9 +919,8 @@ static int netlbl_unlabel_staticadd(struct sk_buff *skb, > if (ret_val != 0) > return ret_val; > > - /* scaffolding with the [0] */ > return netlbl_unlhsh_add(&init_net, > - dev_name, addr, mask, addr_len, blob.secid[0], > + dev_name, addr, mask, addr_len, &blob, > &audit_info); > } > > @@ -977,10 +968,8 @@ static int netlbl_unlabel_staticadddef(struct sk_buff *skb, > if (ret_val != 0) > return ret_val; > > - /* scaffolding with the [0] */ > return netlbl_unlhsh_add(&init_net, > - NULL, addr, mask, addr_len, blob.secid[0], > - &audit_info); > + NULL, addr, mask, addr_len, &blob, &audit_info); > } > > /** > @@ -1092,8 +1081,7 @@ static int netlbl_unlabel_staticlist_gen(u32 cmd, > struct net_device *dev; > struct lsmcontext context; > void *data; > - u32 secid; > - struct lsmblob blob; > + struct lsmblob *lsmb; > > data = genlmsg_put(cb_arg->skb, NETLINK_CB(cb_arg->nl_cb->skb).portid, > cb_arg->seq, &netlbl_unlabel_gnl_family, > @@ -1131,7 +1119,7 @@ static int netlbl_unlabel_staticlist_gen(u32 cmd, > if (ret_val != 0) > goto list_cb_failure; > > - secid = addr4->secid; > + lsmb = (struct lsmblob *)&addr4->lsmblob; > } else { > ret_val = nla_put_in6_addr(cb_arg->skb, > NLBL_UNLABEL_A_IPV6ADDR, > @@ -1145,11 +1133,10 @@ static int netlbl_unlabel_staticlist_gen(u32 cmd, > if (ret_val != 0) > goto list_cb_failure; > > - secid = addr6->secid; > + lsmb = (struct lsmblob *)&addr6->lsmblob; > } > > - lsmblob_init(&blob, secid); > - ret_val = security_secid_to_secctx(&blob, &context); > + ret_val = security_secid_to_secctx(lsmb, &context); > if (ret_val != 0) > goto list_cb_failure; > ret_val = nla_put(cb_arg->skb, > @@ -1500,7 +1487,7 @@ int netlbl_unlabel_getattr(const struct sk_buff *skb, > &iface->addr4_list); > if (addr4 == NULL) > goto unlabel_getattr_nolabel; > - secattr->attr.secid = netlbl_unlhsh_addr4_entry(addr4)->secid; > + secattr->attr.lsmblob = netlbl_unlhsh_addr4_entry(addr4)->lsmblob; > break; > } > #if IS_ENABLED(CONFIG_IPV6) > @@ -1513,7 +1500,7 @@ int netlbl_unlabel_getattr(const struct sk_buff *skb, > &iface->addr6_list); > if (addr6 == NULL) > goto unlabel_getattr_nolabel; > - secattr->attr.secid = netlbl_unlhsh_addr6_entry(addr6)->secid; > + secattr->attr.lsmblob = netlbl_unlhsh_addr6_entry(addr6)->lsmblob; > break; > } > #endif /* IPv6 */ > diff --git a/net/netlabel/netlabel_unlabeled.h b/net/netlabel/netlabel_unlabeled.h > index 3a9e5dc9511b..dcff99695c97 100644 > --- a/net/netlabel/netlabel_unlabeled.h > +++ b/net/netlabel/netlabel_unlabeled.h > @@ -225,7 +225,7 @@ int netlbl_unlhsh_add(struct net *net, > const void *addr, > const void *mask, > u32 addr_len, > - u32 secid, > + struct lsmblob *lsmblob, > struct netlbl_audit *audit_info); > int netlbl_unlhsh_remove(struct net *net, > const char *dev_name, > diff --git a/security/selinux/include/security.h b/security/selinux/include/security.h > index b5b7c5aade8c..94787988c8fb 100644 > --- a/security/selinux/include/security.h > +++ b/security/selinux/include/security.h > @@ -68,6 +68,7 @@ > struct netlbl_lsm_secattr; > > extern int selinux_enabled; > +extern int selinux_lsmblob_slot; > > /* Policy capabilities */ > enum { > diff --git a/security/selinux/netlabel.c b/security/selinux/netlabel.c > index c40914a157b7..320a4cdc657e 100644 > --- a/security/selinux/netlabel.c > +++ b/security/selinux/netlabel.c > @@ -122,7 +122,7 @@ static struct netlbl_lsm_secattr *selinux_netlbl_sock_getattr( > return NULL; > > if ((secattr->flags & NETLBL_SECATTR_SECID) && > - (secattr->attr.secid == sid)) > + (secattr->attr.lsmblob.secid[selinux_lsmblob_slot] == sid)) > return secattr; > > return NULL; > diff --git a/security/selinux/ss/services.c b/security/selinux/ss/services.c > index e3f5d6aece66..a3be1afafd7f 100644 > --- a/security/selinux/ss/services.c > +++ b/security/selinux/ss/services.c > @@ -3593,7 +3593,7 @@ int security_netlbl_secattr_to_sid(struct selinux_state *state, > if (secattr->flags & NETLBL_SECATTR_CACHE) > *sid = *(u32 *)secattr->cache->data; > else if (secattr->flags & NETLBL_SECATTR_SECID) > - *sid = secattr->attr.secid; > + *sid = secattr->attr.lsmblob.secid[selinux_lsmblob_slot]; > else if (secattr->flags & NETLBL_SECATTR_MLS_LVL) { > rc = -EIDRM; > ctx = sidtab_search(sidtab, SECINITSID_NETMSG); > @@ -3666,7 +3666,7 @@ int security_netlbl_sid_to_secattr(struct selinux_state *state, > if (secattr->domain == NULL) > goto out; > > - secattr->attr.secid = sid; > + secattr->attr.lsmblob.secid[selinux_lsmblob_slot] = sid; > secattr->flags |= NETLBL_SECATTR_DOMAIN_CPY | NETLBL_SECATTR_SECID; > mls_export_netlbl_lvl(policydb, ctx, secattr); > rc = mls_export_netlbl_cat(policydb, ctx, secattr); > diff --git a/security/smack/smack.h b/security/smack/smack.h > index 7cc3a3382fee..097ffde7f202 100644 > --- a/security/smack/smack.h > +++ b/security/smack/smack.h > @@ -320,6 +320,7 @@ void smk_destroy_label_list(struct list_head *list); > * Shared data. > */ > extern int smack_enabled; > +extern int smack_lsmblob_slot; > extern int smack_cipso_direct; > extern int smack_cipso_mapped; > extern struct smack_known *smack_net_ambient; > diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c > index 273f311fb153..b83aba0f2013 100644 > --- a/security/smack/smack_lsm.c > +++ b/security/smack/smack_lsm.c > @@ -3742,7 +3742,8 @@ static struct smack_known *smack_from_secattr(struct netlbl_lsm_secattr *sap, > /* > * Looks like a fallback, which gives us a secid. > */ > - return smack_from_secid(sap->attr.secid); > + return smack_from_secid( > + sap->attr.lsmblob.secid[smack_lsmblob_slot]); > /* > * Without guidance regarding the smack value > * for the packet fall back on the network > diff --git a/security/smack/smackfs.c b/security/smack/smackfs.c > index faf2ea3968b3..066d53c29ed4 100644 > --- a/security/smack/smackfs.c > +++ b/security/smack/smackfs.c > @@ -1150,6 +1150,7 @@ static void smk_net4addr_insert(struct smk_net4addr *new) > static ssize_t smk_write_net4addr(struct file *file, const char __user *buf, > size_t count, loff_t *ppos) > { > + struct lsmblob lsmblob; > struct smk_net4addr *snp; > struct sockaddr_in newname; > char *smack; > @@ -1281,10 +1282,13 @@ static ssize_t smk_write_net4addr(struct file *file, const char __user *buf, > * this host so that incoming packets get labeled. > * but only if we didn't get the special CIPSO option > */ > - if (rc == 0 && skp != NULL) > + if (rc == 0 && skp != NULL) { > + lsmblob_init(&lsmblob, 0); > + lsmblob.secid[smack_lsmblob_slot] = snp->smk_label->smk_secid; > rc = netlbl_cfg_unlbl_static_add(&init_net, NULL, > - &snp->smk_host, &snp->smk_mask, PF_INET, > - snp->smk_label->smk_secid, &audit_info); > + &snp->smk_host, &snp->smk_mask, PF_INET, &lsmblob, > + &audit_info); > + } > > if (rc == 0) > rc = count; > -- > 2.20.1 > -- Kees Cook