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=-4.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,UNWANTED_LANGUAGE_BODY autolearn=unavailable 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 0C29AC2BA1A for ; Tue, 7 Apr 2020 18:41:31 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9991720730 for ; Tue, 7 Apr 2020 18:41:30 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="ROzvi7Yn" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9991720730 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=linux-audit-bounces@redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1586284889; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=NBoamNhhu/8lrbVJVqlaPViB1cdVmNSKVXKDyzIAqTE=; b=ROzvi7Yn5u6SpqQYUvUIc+vkfK7QNKhCvYsWzfRekDhhMqo7xqtRGU+lHqPUUIXFkBV8TK Eu21gkMA74+bf1BjRLTqt9lvKnEC90WrN5Uo0HT3y/i7g6VoN4xmVG6V49cStSLK3saU/F 04bxO4KJuXf8hhngfj5F/icJc4e3krE= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-58-TP94NkWuP72LlVqha3m6CQ-1; Tue, 07 Apr 2020 14:41:27 -0400 X-MC-Unique: TP94NkWuP72LlVqha3m6CQ-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id ED2421005509; Tue, 7 Apr 2020 18:41:23 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id BEF4D1001B07; Tue, 7 Apr 2020 18:41:23 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 673361803C38; Tue, 7 Apr 2020 18:41:23 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 037IfLBu007736 for ; Tue, 7 Apr 2020 14:41:21 -0400 Received: by smtp.corp.redhat.com (Postfix) id 2BE3710545E0; Tue, 7 Apr 2020 18:41:21 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast05.extmail.prod.ext.rdu2.redhat.com [10.11.55.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2753410545E2 for ; Tue, 7 Apr 2020 18:41:18 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 8530780029A for ; Tue, 7 Apr 2020 18:41:18 +0000 (UTC) Received: from mail-pg1-f194.google.com (mail-pg1-f194.google.com [209.85.215.194]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-314-_RUkP1F7OUyzzrdJ2na5hQ-1; Tue, 07 Apr 2020 14:41:16 -0400 X-MC-Unique: _RUkP1F7OUyzzrdJ2na5hQ-1 Received: by mail-pg1-f194.google.com with SMTP id d17so2149460pgo.0 for ; Tue, 07 Apr 2020 11:41:15 -0700 (PDT) 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=CqXEKnSDCPEcGwY0Tt3etc5c1GTxVn2RaBbscAk5YVI=; b=fNFWerV3bYxtKOvsQLhMblYB/jCaphw1mSCz26q9X8aB8LST9FF+ErKGSc01EdAWSv 7BQqvt2nSqo0GE7ovOVvUcwnYpO4lhM/MhIiu1vnAKOJU8enTqiA23pGBEwBYxVCuGpN MppnHphSteSPEvF7d+PtXyVyKQr4crqoQNLBlJtlfpunZspOZz1I+N+O07UmZ85wjPDL X5feU9ajsS5B0KscpL6wE34MDgokRRHlDlZx3CGsykKUdmHFjq7BhzNLl4NB/+XnioQd EYATzdG1CGq79QtIegwtIx/cF9+PJZLXLxFfm1vISC+fdnmldEJfejtrxAOtdm3WNxH7 GiIA== X-Gm-Message-State: AGi0Pub0ItMWXDWAaI0KIjjF499Rb6eLQxATYRZq8rP+7LKUBGDtn6P/ 4L9nncyIS3rWs/UpcOzWlKIhjQ== X-Google-Smtp-Source: APiQypKvFMdCPf4xuEO+HbP9VPqnZJNtcKm9ejydAR/A8IJnk1VHnrvWOXC7wxZgC90C8lvDkDiVow== X-Received: by 2002:a63:5c01:: with SMTP id q1mr3221321pgb.177.1586284874441; Tue, 07 Apr 2020 11:41:14 -0700 (PDT) Received: from www.outflux.net (smtp.outflux.net. [198.145.64.163]) by smtp.gmail.com with ESMTPSA id t1sm2254701pjf.26.2020.04.07.11.41.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Apr 2020 11:41:13 -0700 (PDT) Date: Tue, 7 Apr 2020 11:41:12 -0700 From: Kees Cook To: Casey Schaufler Subject: Re: [PATCH v16 15/23] LSM: Use lsmcontext in security_secid_to_secctx Message-ID: <202004071141.D565FC80@keescook> References: <20200407000159.43602-1-casey@schaufler-ca.com> <20200407000159.43602-16-casey@schaufler-ca.com> MIME-Version: 1.0 In-Reply-To: <20200407000159.43602-16-casey@schaufler-ca.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id 037IfLBu007736 X-loop: linux-audit@redhat.com Cc: john.johansen@canonical.com, selinux@vger.kernel.org, jmorris@namei.org, linux-security-module@vger.kernel.org, linux-audit@redhat.com, casey.schaufler@intel.com, sds@tycho.nsa.gov X-BeenThere: linux-audit@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Linux Audit Discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-audit-bounces@redhat.com Errors-To: linux-audit-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline On Mon, Apr 06, 2020 at 05:01:51PM -0700, Casey Schaufler wrote: > Replace the (secctx,seclen) pointer pair with a single > lsmcontext pointer to allow return of the LSM identifier > along with the context and context length. This allows > security_release_secctx() to know how to release the > context. Callers have been modified to use or save the > returned data from the new structure. > > Acked-by: Stephen Smalley > Acked-by: Paul Moore > Signed-off-by: Casey Schaufler Reviewed-by: Kees Cook -Kees > Cc: netdev@vger.kernel.org > --- > drivers/android/binder.c | 26 +++++++--------- > include/linux/security.h | 4 +-- > include/net/scm.h | 10 ++----- > kernel/audit.c | 35 ++++++++-------------- > kernel/auditsc.c | 31 +++++++------------ > net/ipv4/ip_sockglue.c | 7 ++--- > net/netfilter/nf_conntrack_netlink.c | 18 +++++------ > net/netfilter/nf_conntrack_standalone.c | 7 ++--- > net/netfilter/nfnetlink_queue.c | 5 +++- > net/netlabel/netlabel_unlabeled.c | 40 ++++++++----------------- > net/netlabel/netlabel_user.c | 7 ++--- > security/security.c | 10 +++++-- > 12 files changed, 76 insertions(+), 124 deletions(-) > > diff --git a/drivers/android/binder.c b/drivers/android/binder.c > index 30e59b386ce2..c76fc2abd091 100644 > --- a/drivers/android/binder.c > +++ b/drivers/android/binder.c > @@ -2861,9 +2861,7 @@ static void binder_transaction(struct binder_proc *proc, > binder_size_t last_fixup_min_off = 0; > struct binder_context *context = proc->context; > int t_debug_id = atomic_inc_return(&binder_last_id); > - char *secctx = NULL; > - u32 secctx_sz = 0; > - struct lsmcontext scaff; /* scaffolding */ > + struct lsmcontext lsmctx = { }; > > e = binder_transaction_log_add(&binder_transaction_log); > e->debug_id = t_debug_id; > @@ -3111,14 +3109,14 @@ static void binder_transaction(struct binder_proc *proc, > size_t added_size; > > security_task_getsecid(proc->tsk, &blob); > - ret = security_secid_to_secctx(&blob, &secctx, &secctx_sz); > + ret = security_secid_to_secctx(&blob, &lsmctx); > if (ret) { > return_error = BR_FAILED_REPLY; > return_error_param = ret; > return_error_line = __LINE__; > goto err_get_secctx_failed; > } > - added_size = ALIGN(secctx_sz, sizeof(u64)); > + added_size = ALIGN(lsmctx.len, sizeof(u64)); > extra_buffers_size += added_size; > if (extra_buffers_size < added_size) { > /* integer overflow of extra_buffers_size */ > @@ -3145,24 +3143,22 @@ static void binder_transaction(struct binder_proc *proc, > t->buffer = NULL; > goto err_binder_alloc_buf_failed; > } > - if (secctx) { > + if (lsmctx.context) { > int err; > size_t buf_offset = ALIGN(tr->data_size, sizeof(void *)) + > ALIGN(tr->offsets_size, sizeof(void *)) + > ALIGN(extra_buffers_size, sizeof(void *)) - > - ALIGN(secctx_sz, sizeof(u64)); > + ALIGN(lsmctx.len, sizeof(u64)); > > t->security_ctx = (uintptr_t)t->buffer->user_data + buf_offset; > err = binder_alloc_copy_to_buffer(&target_proc->alloc, > t->buffer, buf_offset, > - secctx, secctx_sz); > + lsmctx.context, lsmctx.len); > if (err) { > t->security_ctx = 0; > WARN_ON(1); > } > - lsmcontext_init(&scaff, secctx, secctx_sz, 0); > - security_release_secctx(&scaff); > - secctx = NULL; > + security_release_secctx(&lsmctx); > } > t->buffer->debug_id = t->debug_id; > t->buffer->transaction = t; > @@ -3218,7 +3214,7 @@ static void binder_transaction(struct binder_proc *proc, > off_end_offset = off_start_offset + tr->offsets_size; > sg_buf_offset = ALIGN(off_end_offset, sizeof(void *)); > sg_buf_end_offset = sg_buf_offset + extra_buffers_size - > - ALIGN(secctx_sz, sizeof(u64)); > + ALIGN(lsmctx.len, sizeof(u64)); > off_min = 0; > for (buffer_offset = off_start_offset; buffer_offset < off_end_offset; > buffer_offset += sizeof(binder_size_t)) { > @@ -3494,10 +3490,8 @@ static void binder_transaction(struct binder_proc *proc, > binder_alloc_free_buf(&target_proc->alloc, t->buffer); > err_binder_alloc_buf_failed: > err_bad_extra_size: > - if (secctx) { > - lsmcontext_init(&scaff, secctx, secctx_sz, 0); > - security_release_secctx(&scaff); > - } > + if (lsmctx.context) > + security_release_secctx(&lsmctx); > err_get_secctx_failed: > kfree(tcomplete); > binder_stats_deleted(BINDER_STAT_TRANSACTION_COMPLETE); > diff --git a/include/linux/security.h b/include/linux/security.h > index 2e83c5bf37b0..ec64ccd2e168 100644 > --- a/include/linux/security.h > +++ b/include/linux/security.h > @@ -549,7 +549,7 @@ int security_setprocattr(const char *lsm, const char *name, void *value, > size_t size); > int security_netlink_send(struct sock *sk, struct sk_buff *skb); > int security_ismaclabel(const char *name); > -int security_secid_to_secctx(struct lsmblob *blob, char **secdata, u32 *seclen); > +int security_secid_to_secctx(struct lsmblob *blob, struct lsmcontext *cp); > int security_secctx_to_secid(const char *secdata, u32 seclen, > struct lsmblob *blob); > void security_release_secctx(struct lsmcontext *cp); > @@ -1354,7 +1354,7 @@ static inline int security_ismaclabel(const char *name) > } > > static inline int security_secid_to_secctx(struct lsmblob *blob, > - char **secdata, u32 *seclen) > + struct lsmcontext *cp) > { > return -EOPNOTSUPP; > } > diff --git a/include/net/scm.h b/include/net/scm.h > index 30ba801c91bd..4a6ad8caf423 100644 > --- a/include/net/scm.h > +++ b/include/net/scm.h > @@ -93,18 +93,14 @@ static __inline__ int scm_send(struct socket *sock, struct msghdr *msg, > static inline void scm_passec(struct socket *sock, struct msghdr *msg, struct scm_cookie *scm) > { > struct lsmcontext context; > - char *secdata; > - u32 seclen; > int err; > > if (test_bit(SOCK_PASSSEC, &sock->flags)) { > - err = security_secid_to_secctx(&scm->lsmblob, &secdata, > - &seclen); > + err = security_secid_to_secctx(&scm->lsmblob, &context); > > if (!err) { > - put_cmsg(msg, SOL_SOCKET, SCM_SECURITY, seclen, secdata); > - /*scaffolding*/ > - lsmcontext_init(&context, secdata, seclen, 0); > + put_cmsg(msg, SOL_SOCKET, SCM_SECURITY, > + context.len, context.context); > security_release_secctx(&context); > } > } > diff --git a/kernel/audit.c b/kernel/audit.c > index 128875679101..013a90dd2bd5 100644 > --- a/kernel/audit.c > +++ b/kernel/audit.c > @@ -1178,9 +1178,7 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh) > struct audit_buffer *ab; > u16 msg_type = nlh->nlmsg_type; > struct audit_sig_info *sig_data; > - char *ctx = NULL; > - u32 len; > - struct lsmcontext scaff; /* scaffolding */ > + struct lsmcontext context = { }; > > err = audit_netlink_ok(skb, msg_type); > if (err) > @@ -1419,30 +1417,26 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh) > break; > } > case AUDIT_SIGNAL_INFO: > - len = 0; > if (lsmblob_is_set(&audit_sig_lsm)) { > - err = security_secid_to_secctx(&audit_sig_lsm, &ctx, > - &len); > + err = security_secid_to_secctx(&audit_sig_lsm, > + &context); > if (err) > return err; > } > - sig_data = kmalloc(sizeof(*sig_data) + len, GFP_KERNEL); > + sig_data = kmalloc(sizeof(*sig_data) + context.len, GFP_KERNEL); > if (!sig_data) { > - if (lsmblob_is_set(&audit_sig_lsm)) { > - lsmcontext_init(&scaff, ctx, len, 0); > - security_release_secctx(&scaff); > - } > + if (lsmblob_is_set(&audit_sig_lsm)) > + security_release_secctx(&context); > return -ENOMEM; > } > sig_data->uid = from_kuid(&init_user_ns, audit_sig_uid); > sig_data->pid = audit_sig_pid; > if (lsmblob_is_set(&audit_sig_lsm)) { > - memcpy(sig_data->ctx, ctx, len); > - lsmcontext_init(&scaff, ctx, len, 0); > - security_release_secctx(&scaff); > + memcpy(sig_data->ctx, context.context, context.len); > + security_release_secctx(&context); > } > audit_send_reply(skb, seq, AUDIT_SIGNAL_INFO, 0, 0, > - sig_data, sizeof(*sig_data) + len); > + sig_data, sizeof(*sig_data) + context.len); > kfree(sig_data); > break; > case AUDIT_TTY_GET: { > @@ -2064,26 +2058,23 @@ void audit_log_key(struct audit_buffer *ab, char *key) > > int audit_log_task_context(struct audit_buffer *ab) > { > - char *ctx = NULL; > - unsigned len; > int error; > struct lsmblob blob; > - struct lsmcontext scaff; /* scaffolding */ > + struct lsmcontext context; > > security_task_getsecid(current, &blob); > if (!lsmblob_is_set(&blob)) > return 0; > > - error = security_secid_to_secctx(&blob, &ctx, &len); > + error = security_secid_to_secctx(&blob, &context); > if (error) { > if (error != -EINVAL) > goto error_path; > return 0; > } > > - audit_log_format(ab, " subj=%s", ctx); > - lsmcontext_init(&scaff, ctx, len, 0); > - security_release_secctx(&scaff); > + audit_log_format(ab, " subj=%s", context.context); > + security_release_secctx(&context); > return 0; > > error_path: > diff --git a/kernel/auditsc.c b/kernel/auditsc.c > index 94aeedfa3ce4..b7275860ba5f 100644 > --- a/kernel/auditsc.c > +++ b/kernel/auditsc.c > @@ -969,9 +969,7 @@ static int audit_log_pid_context(struct audit_context *context, pid_t pid, > struct lsmblob *blob, char *comm) > { > struct audit_buffer *ab; > - struct lsmcontext lsmcxt; > - char *ctx = NULL; > - u32 len; > + struct lsmcontext lsmctx; > int rc = 0; > > ab = audit_log_start(context, GFP_KERNEL, AUDIT_OBJ_PID); > @@ -982,13 +980,12 @@ static int audit_log_pid_context(struct audit_context *context, pid_t pid, > from_kuid(&init_user_ns, auid), > from_kuid(&init_user_ns, uid), sessionid); > if (lsmblob_is_set(blob)) { > - if (security_secid_to_secctx(blob, &ctx, &len)) { > + if (security_secid_to_secctx(blob, &lsmctx)) { > audit_log_format(ab, " obj=(none)"); > rc = 1; > } else { > - audit_log_format(ab, " obj=%s", ctx); > - lsmcontext_init(&lsmcxt, ctx, len, 0); /*scaffolding*/ > - security_release_secctx(&lsmcxt); > + audit_log_format(ab, " obj=%s", lsmctx.context); > + security_release_secctx(&lsmctx); > } > } > audit_log_format(ab, " ocomm="); > @@ -1201,7 +1198,6 @@ static void audit_log_fcaps(struct audit_buffer *ab, struct audit_names *name) > > static void show_special(struct audit_context *context, int *call_panic) > { > - struct lsmcontext lsmcxt; > struct audit_buffer *ab; > int i; > > @@ -1225,17 +1221,15 @@ static void show_special(struct audit_context *context, int *call_panic) > from_kgid(&init_user_ns, context->ipc.gid), > context->ipc.mode); > if (osid) { > - char *ctx = NULL; > - u32 len; > + struct lsmcontext lsmcxt; > struct lsmblob blob; > > lsmblob_init(&blob, osid); > - if (security_secid_to_secctx(&blob, &ctx, &len)) { > + if (security_secid_to_secctx(&blob, &lsmcxt)) { > audit_log_format(ab, " osid=%u", osid); > *call_panic = 1; > } else { > - audit_log_format(ab, " obj=%s", ctx); > - lsmcontext_init(&lsmcxt, ctx, len, 0); > + audit_log_format(ab, " obj=%s", lsmcxt.context); > security_release_secctx(&lsmcxt); > } > } > @@ -1379,20 +1373,17 @@ static void audit_log_name(struct audit_context *context, struct audit_names *n, > MAJOR(n->rdev), > MINOR(n->rdev)); > if (n->osid != 0) { > - char *ctx = NULL; > - u32 len; > struct lsmblob blob; > - struct lsmcontext lsmcxt; > + struct lsmcontext lsmctx; > > lsmblob_init(&blob, n->osid); > - if (security_secid_to_secctx(&blob, &ctx, &len)) { > + if (security_secid_to_secctx(&blob, &lsmctx)) { > audit_log_format(ab, " osid=%u", n->osid); > if (call_panic) > *call_panic = 2; > } else { > - audit_log_format(ab, " obj=%s", ctx); > - lsmcontext_init(&lsmcxt, ctx, len, 0); /* scaffolding */ > - security_release_secctx(&lsmcxt); > + audit_log_format(ab, " obj=%s", lsmctx.context); > + security_release_secctx(&lsmctx); > } > } > > diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c > index 96d56a30ecca..27af7a6b8780 100644 > --- a/net/ipv4/ip_sockglue.c > +++ b/net/ipv4/ip_sockglue.c > @@ -132,20 +132,17 @@ static void ip_cmsg_recv_security(struct msghdr *msg, struct sk_buff *skb) > { > struct lsmcontext context; > struct lsmblob lb; > - char *secdata; > - u32 seclen; > int err; > > err = security_socket_getpeersec_dgram(NULL, skb, &lb); > if (err) > return; > > - err = security_secid_to_secctx(&lb, &secdata, &seclen); > + err = security_secid_to_secctx(&lb, &context); > if (err) > return; > > - put_cmsg(msg, SOL_IP, SCM_SECURITY, seclen, secdata); > - lsmcontext_init(&context, secdata, seclen, 0); /* scaffolding */ > + put_cmsg(msg, SOL_IP, SCM_SECURITY, context.len, context.context); > security_release_secctx(&context); > } > > diff --git a/net/netfilter/nf_conntrack_netlink.c b/net/netfilter/nf_conntrack_netlink.c > index 131df0661bfa..2fa1e5bd781d 100644 > --- a/net/netfilter/nf_conntrack_netlink.c > +++ b/net/netfilter/nf_conntrack_netlink.c > @@ -329,8 +329,7 @@ static int ctnetlink_dump_mark(struct sk_buff *skb, const struct nf_conn *ct) > static int ctnetlink_dump_secctx(struct sk_buff *skb, const struct nf_conn *ct) > { > struct nlattr *nest_secctx; > - int len, ret; > - char *secctx; > + int ret; > struct lsmblob blob; > struct lsmcontext context; > > @@ -338,7 +337,7 @@ static int ctnetlink_dump_secctx(struct sk_buff *skb, const struct nf_conn *ct) > * security_secid_to_secctx() will know which security module > * to use to create the secctx. */ > lsmblob_init(&blob, ct->secmark); > - ret = security_secid_to_secctx(&blob, &secctx, &len); > + ret = security_secid_to_secctx(&blob, &context); > if (ret) > return 0; > > @@ -347,13 +346,12 @@ static int ctnetlink_dump_secctx(struct sk_buff *skb, const struct nf_conn *ct) > if (!nest_secctx) > goto nla_put_failure; > > - if (nla_put_string(skb, CTA_SECCTX_NAME, secctx)) > + if (nla_put_string(skb, CTA_SECCTX_NAME, context.context)) > goto nla_put_failure; > nla_nest_end(skb, nest_secctx); > > ret = 0; > nla_put_failure: > - lsmcontext_init(&context, secctx, len, 0); /* scaffolding */ > security_release_secctx(&context); > return ret; > } > @@ -651,15 +649,15 @@ static inline int ctnetlink_secctx_size(const struct nf_conn *ct) > #ifdef CONFIG_NF_CONNTRACK_SECMARK > int len, ret; > struct lsmblob blob; > + struct lsmcontext context; > > - /* lsmblob_init() puts ct->secmark into all of the secids in blob. > - * security_secid_to_secctx() will know which security module > - * to use to create the secctx. */ > - lsmblob_init(&blob, ct->secmark); > - ret = security_secid_to_secctx(&blob, NULL, &len); > + ret = security_secid_to_secctx(&blob, &context); > if (ret) > return 0; > > + len = context.len; > + security_release_secctx(&context); > + > return nla_total_size(0) /* CTA_SECCTX */ > + nla_total_size(sizeof(char) * len); /* CTA_SECCTX_NAME */ > #else > diff --git a/net/netfilter/nf_conntrack_standalone.c b/net/netfilter/nf_conntrack_standalone.c > index f4de2c734557..383a4f44be63 100644 > --- a/net/netfilter/nf_conntrack_standalone.c > +++ b/net/netfilter/nf_conntrack_standalone.c > @@ -173,19 +173,16 @@ static void ct_seq_stop(struct seq_file *s, void *v) > static void ct_show_secctx(struct seq_file *s, const struct nf_conn *ct) > { > int ret; > - u32 len; > - char *secctx; > struct lsmblob blob; > struct lsmcontext context; > > lsmblob_init(&blob, ct->secmark); > - ret = security_secid_to_secctx(&blob, &secctx, &len); > + ret = security_secid_to_secctx(&blob, &context); > if (ret) > return; > > - seq_printf(s, "secctx=%s ", secctx); > + seq_printf(s, "secctx=%s ", context.context); > > - lsmcontext_init(&context, secctx, len, 0); /* scaffolding */ > security_release_secctx(&context); > } > #else > diff --git a/net/netfilter/nfnetlink_queue.c b/net/netfilter/nfnetlink_queue.c > index f3bb11828d73..880da01ef4d3 100644 > --- a/net/netfilter/nfnetlink_queue.c > +++ b/net/netfilter/nfnetlink_queue.c > @@ -306,6 +306,7 @@ static u32 nfqnl_get_sk_secctx(struct sk_buff *skb, char **secdata) > u32 seclen = 0; > #if IS_ENABLED(CONFIG_NETWORK_SECMARK) > struct lsmblob blob; > + struct lsmcontext context = { }; > > if (!skb || !sk_fullsock(skb->sk)) > return 0; > @@ -317,10 +318,12 @@ static u32 nfqnl_get_sk_secctx(struct sk_buff *skb, char **secdata) > * blob. security_secid_to_secctx() will know which security > * module to use to create the secctx. */ > lsmblob_init(&blob, skb->secmark); > - security_secid_to_secctx(&blob, secdata, &seclen); > + security_secid_to_secctx(&blob, &context); > + *secdata = context.context; > } > > read_unlock_bh(&skb->sk->sk_callback_lock); > + seclen = context.len; > #endif > return seclen; > } > diff --git a/net/netlabel/netlabel_unlabeled.c b/net/netlabel/netlabel_unlabeled.c > index 5785e6dcf54b..cf4c56beb3ec 100644 > --- a/net/netlabel/netlabel_unlabeled.c > +++ b/net/netlabel/netlabel_unlabeled.c > @@ -375,8 +375,6 @@ int netlbl_unlhsh_add(struct net *net, > struct netlbl_unlhsh_iface *iface; > struct audit_buffer *audit_buf = NULL; > struct lsmcontext context; > - char *secctx = NULL; > - u32 secctx_len; > struct lsmblob blob; > > if (addr_len != sizeof(struct in_addr) && > @@ -444,12 +442,9 @@ int netlbl_unlhsh_add(struct net *net, > * security_secid_to_secctx() will know which security module > * to use to create the secctx. */ > lsmblob_init(&blob, secid); > - if (security_secid_to_secctx(&blob, > - &secctx, > - &secctx_len) == 0) { > - audit_log_format(audit_buf, " sec_obj=%s", secctx); > - /* scaffolding */ > - lsmcontext_init(&context, secctx, secctx_len, 0); > + if (security_secid_to_secctx(&blob, &context) == 0) { > + audit_log_format(audit_buf, " sec_obj=%s", > + context.context); > security_release_secctx(&context); > } > audit_log_format(audit_buf, " res=%u", ret_val == 0 ? 1 : 0); > @@ -482,8 +477,6 @@ static int netlbl_unlhsh_remove_addr4(struct net *net, > struct audit_buffer *audit_buf; > struct net_device *dev; > struct lsmcontext context; > - char *secctx; > - u32 secctx_len; > struct lsmblob blob; > > spin_lock(&netlbl_unlhsh_lock); > @@ -510,11 +503,9 @@ static int netlbl_unlhsh_remove_addr4(struct net *net, > if (entry != NULL) > lsmblob_init(&blob, entry->secid); > if (entry != NULL && > - security_secid_to_secctx(&blob, > - &secctx, &secctx_len) == 0) { > - audit_log_format(audit_buf, " sec_obj=%s", secctx); > - /* scaffolding */ > - lsmcontext_init(&context, secctx, secctx_len, 0); > + security_secid_to_secctx(&blob, &context) == 0) { > + audit_log_format(audit_buf, " sec_obj=%s", > + context.context); > security_release_secctx(&context); > } > audit_log_format(audit_buf, " res=%u", entry != NULL ? 1 : 0); > @@ -553,8 +544,6 @@ static int netlbl_unlhsh_remove_addr6(struct net *net, > struct audit_buffer *audit_buf; > struct net_device *dev; > struct lsmcontext context; > - char *secctx; > - u32 secctx_len; > struct lsmblob blob; > > spin_lock(&netlbl_unlhsh_lock); > @@ -580,10 +569,9 @@ static int netlbl_unlhsh_remove_addr6(struct net *net, > if (entry != NULL) > lsmblob_init(&blob, entry->secid); > if (entry != NULL && > - security_secid_to_secctx(&blob, > - &secctx, &secctx_len) == 0) { > - audit_log_format(audit_buf, " sec_obj=%s", secctx); > - lsmcontext_init(&context, secctx, secctx_len, 0); > + security_secid_to_secctx(&blob, &context) == 0) { > + audit_log_format(audit_buf, " sec_obj=%s", > + context.context); > security_release_secctx(&context); > } > audit_log_format(audit_buf, " res=%u", entry != NULL ? 1 : 0); > @@ -1106,8 +1094,6 @@ static int netlbl_unlabel_staticlist_gen(u32 cmd, > struct lsmcontext context; > void *data; > u32 secid; > - char *secctx; > - u32 secctx_len; > struct lsmblob blob; > > data = genlmsg_put(cb_arg->skb, NETLINK_CB(cb_arg->nl_cb->skb).portid, > @@ -1167,15 +1153,13 @@ static int netlbl_unlabel_staticlist_gen(u32 cmd, > * security_secid_to_secctx() will know which security module > * to use to create the secctx. */ > lsmblob_init(&blob, secid); > - ret_val = security_secid_to_secctx(&blob, &secctx, &secctx_len); > + ret_val = security_secid_to_secctx(&blob, &context); > if (ret_val != 0) > goto list_cb_failure; > ret_val = nla_put(cb_arg->skb, > NLBL_UNLABEL_A_SECCTX, > - secctx_len, > - secctx); > - /* scaffolding */ > - lsmcontext_init(&context, secctx, secctx_len, 0); > + context.len, > + context.context); > security_release_secctx(&context); > if (ret_val != 0) > goto list_cb_failure; > diff --git a/net/netlabel/netlabel_user.c b/net/netlabel/netlabel_user.c > index ef139d8ae7cd..951ba0639d20 100644 > --- a/net/netlabel/netlabel_user.c > +++ b/net/netlabel/netlabel_user.c > @@ -85,8 +85,6 @@ struct audit_buffer *netlbl_audit_start_common(int type, > { > struct audit_buffer *audit_buf; > struct lsmcontext context; > - char *secctx; > - u32 secctx_len; > struct lsmblob blob; > > if (audit_enabled == AUDIT_OFF) > @@ -102,9 +100,8 @@ struct audit_buffer *netlbl_audit_start_common(int type, > > lsmblob_init(&blob, audit_info->secid); > if (audit_info->secid != 0 && > - security_secid_to_secctx(&blob, &secctx, &secctx_len) == 0) { > - audit_log_format(audit_buf, " subj=%s", secctx); > - lsmcontext_init(&context, secctx, secctx_len, 0);/*scaffolding*/ > + security_secid_to_secctx(&blob, &context) == 0) { > + audit_log_format(audit_buf, " subj=%s", context.context); > security_release_secctx(&context); > } > > diff --git a/security/security.c b/security/security.c > index dcf7eae1f31c..356c5cd94c48 100644 > --- a/security/security.c > +++ b/security/security.c > @@ -2140,18 +2140,22 @@ int security_ismaclabel(const char *name) > } > EXPORT_SYMBOL(security_ismaclabel); > > -int security_secid_to_secctx(struct lsmblob *blob, char **secdata, u32 *seclen) > +int security_secid_to_secctx(struct lsmblob *blob, struct lsmcontext *cp) > { > struct security_hook_list *hp; > int display = lsm_task_display(current); > > + memset(cp, 0, sizeof(*cp)); > + > hlist_for_each_entry(hp, &security_hook_heads.secid_to_secctx, list) { > if (WARN_ON(hp->lsmid->slot < 0 || hp->lsmid->slot >= lsm_slot)) > continue; > - if (display == LSMBLOB_INVALID || display == hp->lsmid->slot) > + if (display == LSMBLOB_INVALID || display == hp->lsmid->slot) { > + cp->slot = hp->lsmid->slot; > return hp->hook.secid_to_secctx( > blob->secid[hp->lsmid->slot], > - secdata, seclen); > + &cp->context, &cp->len); > + } > } > return 0; > } > -- > 2.24.1 > -- Kees Cook -- Linux-audit mailing list Linux-audit@redhat.com https://www.redhat.com/mailman/listinfo/linux-audit