From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-qk1-f171.google.com (mail-qk1-f171.google.com [209.85.222.171]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A94A629CE6 for ; Fri, 19 Jul 2024 02:08:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.171 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721354890; cv=none; b=Fu71MVP6Ied9CMqa3D7r5mfgG5p4OnwxOs08+g9IiAXonupFSXQSZaQR2tjZmCxJ4mWRI7eb9CGEZYVhNCFV/Cxg5Kl9W3Z/fsDXRsozmmCOOwCHONk52n8hPOetTVysOl+KhjaWKwVCN1slAiFFwNCecRKviJAf1u3x1l/prOc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721354890; c=relaxed/simple; bh=5ZcGXS//apEgtQX2XqPaW8VBEtbAmzIFR4sLfvFevMA=; h=Date:Message-ID:MIME-Version:Content-Type:Content-Disposition: From:To:Cc:Subject:References:In-Reply-To; b=bKDN6ptJkY1vMKECcMtFt4sPQuWfvOH0oAR+AJoBCWh/8xzTgAgG2grYM5asvJ2fAc8WVSH/+h9NpcQB+BdX1lIOz3uY12cl98QChfne5e7GQAGpwD0YW7lMrjRZNkj779gJwotP2WnG8lEsISlYuepeGKGh6RfCZ0kcKyiitLQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=paul-moore.com; spf=pass smtp.mailfrom=paul-moore.com; dkim=pass (2048-bit key) header.d=paul-moore.com header.i=@paul-moore.com header.b=cGFiBNMV; arc=none smtp.client-ip=209.85.222.171 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=paul-moore.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=paul-moore.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=paul-moore.com header.i=@paul-moore.com header.b="cGFiBNMV" Received: by mail-qk1-f171.google.com with SMTP id af79cd13be357-79f08b01ba6so83989085a.0 for ; Thu, 18 Jul 2024 19:08:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=paul-moore.com; s=google; t=1721354886; x=1721959686; darn=vger.kernel.org; h=in-reply-to:references:subject:cc:to:from:content-transfer-encoding :content-disposition:mime-version:message-id:date:from:to:cc:subject :date:message-id:reply-to; bh=7T3A18YPB97LPR6SF4j8Sn/pZVY1F/IR3nCX5MC7xN8=; b=cGFiBNMVGdfoN3CVulGGwryC7UCj1rOezo2xkveWzz8TFlvjE6qTiX1YNEDkUzIDc8 6K+xQrjT/buvYHEAMAh87CeTjvckkNcGCE9KxyGQQqTKf1xryPbZuFUq7fF0l4AoOnKx Sc1GD1I0GB+ulUrjptd7hfU50pxDSVgya98fLSrtvr0KOWHieZKpJGDzgYftaqXvNNwc mDjl4O+g4giYPbg4bnQejowcIfre5bPu0KPnOjVj13JdDb/CXPinA3z3Q+mtwu0fYoFa 9PRhzTbfE5s7MOFjTUMSh3Qsf7dg8/Wi07LUvZ9QQF/bSgP18Gbg/rCHUQB7DP9m7/4+ E3LQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721354886; x=1721959686; h=in-reply-to:references:subject:cc:to:from:content-transfer-encoding :content-disposition:mime-version:message-id:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=7T3A18YPB97LPR6SF4j8Sn/pZVY1F/IR3nCX5MC7xN8=; b=dhjqbtV/SeShC80NutfIMRZPbsyCRcDfetBwAobMRfJQ52c+iMGxOZH6E2mTB8/XnS SKE+q90QWLoc7YOJsiMg+q6NdtLTSBPnE+4+i4hij07G7cv3uIiUw4JL4xM7o1ry77HV ufcgvuRQ/iOJ0pqPNDNBehQ3nMdqUWguNi6DX9WDCazSLZPsPaeofjnlhlsmNEJTaOdA SUl+wZfd1f5K5VP5U7rY2TtHIq4klLKwbg+IFEtU1aYd97iKlOuQ5c8WwTViDlZzyWw2 PYxw9amsUC0qjWj2k2A9xOxbX2OI1w6FqOKqPcLcfxVCdJmBYuD/l2Q3jAUPxBzZRr5M IbVg== X-Forwarded-Encrypted: i=1; AJvYcCXhQqpdqTFq+AUg6/bIiDW6/TKoFAhBq5zA8K4QmjFuBLoU5LsumwibUG/4Hr3609qs8KFWXPI5Vq/J+NXMINQ8A7Ko1B4vFjBu1/jm+wEV X-Gm-Message-State: AOJu0YzB/ljdDXAiOuO1SbuY6kNXANDHeJA+hz6bdGv2yQJNRMLpFK4t mG8dsfPSdE4t0xRreO82gsmwwxOF6fYUmRNy6I9wpr1ugDh3MH+1rMUQU6chdQ== X-Google-Smtp-Source: AGHT+IHgEdIdqfk63w+VB4pfUkz4rCmNInwk3vmByH2HiGhUy6RD2ny0XAt6GVYxWU0i2NMuExmVBA== X-Received: by 2002:a05:620a:2591:b0:79e:fd1e:6fc4 with SMTP id af79cd13be357-7a193b54b5amr412753385a.34.1721354886527; Thu, 18 Jul 2024 19:08:06 -0700 (PDT) Received: from localhost ([70.22.175.108]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7a19909434bsm20720885a.126.2024.07.18.19.08.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Jul 2024 19:08:06 -0700 (PDT) Date: Thu, 18 Jul 2024 22:08:05 -0400 Message-ID: <9f26368cc7aeccba460c9bce0a13f301@paul-moore.com> Precedence: bulk X-Mailing-List: linux-integrity@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit From: Paul Moore To: Xu Kuohai , bpf@vger.kernel.org, netdev@vger.kernel.org, linux-security-module@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-integrity@vger.kernel.org, apparmor@lists.ubuntu.com, selinux@vger.kernel.org Cc: Alexei Starovoitov , Andrii Nakryiko , Daniel Borkmann , Martin KaFai Lau , Eduard Zingerman , Song Liu , Yonghong Song , John Fastabend , KP Singh , Stanislav Fomichev , Hao Luo , Jiri Olsa , Matt Bobrowski , Brendan Jackman , James Morris , "Serge E . Hallyn" , Khadija Kamran , Casey Schaufler , Ondrej Mosnacek , Kees Cook , John Johansen , Lukas Bulwahn , Roberto Sassu , Shung-Hsi Yu , Edward Cree , Alexander Viro , Christian Brauner , Trond Myklebust , Anna Schumaker , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Stephen Smalley Subject: Re: [PATCH v4 7/20] lsm: Refactor return value of LSM hook setprocattr References: <20240711111908.3817636-8-xukuohai@huaweicloud.com> In-Reply-To: <20240711111908.3817636-8-xukuohai@huaweicloud.com> On Jul 11, 2024 Xu Kuohai wrote: > > To be consistent with most LSM hooks, convert the return value of > hook setprocattr to 0 or a negative error code. > > Before: > - Hook setprocattr returns the number of bytes written on success > or a negative error code on failure. > > After: > - Hook setprocattr returns 0 on success or a negative error code > on failure. An output parameter @wbytes is introduced to hold > the number of bytes written on success. > > Signed-off-by: Xu Kuohai > --- > fs/proc/base.c | 5 +++-- > include/linux/lsm_hook_defs.h | 3 ++- > include/linux/security.h | 5 +++-- > security/apparmor/lsm.c | 10 +++++++--- > security/security.c | 8 +++++--- > security/selinux/hooks.c | 11 ++++++++--- > security/smack/smack_lsm.c | 14 ++++++++++---- > 7 files changed, 38 insertions(+), 18 deletions(-) The security_setprocattr() hook is another odd case that we probably just want to leave alone for two reasons: 1. With the move to LSM syscalls for getting/setting a task's LSM attributes we are "freezing" the procfs API and not adding any new entries to it. 2. The BPF LSM doesn't currently register any procfs entries. I'd suggest leaving security_setprocattr() as-is and blocking it in the BPF verifier, I can't see any reason why a BPF LSM would need this hook. > diff --git a/fs/proc/base.c b/fs/proc/base.c > index 72a1acd03675..9e1cf6cc674d 100644 > --- a/fs/proc/base.c > +++ b/fs/proc/base.c > @@ -2740,6 +2740,7 @@ static ssize_t proc_pid_attr_write(struct file * file, const char __user * buf, > { > struct inode * inode = file_inode(file); > struct task_struct *task; > + size_t wbytes; > void *page; > int rv; > > @@ -2785,12 +2786,12 @@ static ssize_t proc_pid_attr_write(struct file * file, const char __user * buf, > > rv = security_setprocattr(PROC_I(inode)->op.lsmid, > file->f_path.dentry->d_name.name, page, > - count); > + count, &wbytes); > mutex_unlock(¤t->signal->cred_guard_mutex); > out_free: > kfree(page); > out: > - return rv; > + return rv < 0 ? rv : wbytes; > } > > static const struct file_operations proc_pid_attr_operations = { > diff --git a/include/linux/lsm_hook_defs.h b/include/linux/lsm_hook_defs.h > index dbc16f14f42f..2628514bb19c 100644 > --- a/include/linux/lsm_hook_defs.h > +++ b/include/linux/lsm_hook_defs.h > @@ -287,7 +287,8 @@ LSM_HOOK(int, -EOPNOTSUPP, setselfattr, unsigned int attr, > struct lsm_ctx *ctx, u32 size, u32 flags) > LSM_HOOK(int, -EINVAL, getprocattr, struct task_struct *p, const char *name, > char **value) > -LSM_HOOK(int, -EINVAL, setprocattr, const char *name, void *value, size_t size) > +LSM_HOOK(int, -EINVAL, setprocattr, const char *name, void *value, size_t size, > + size_t *wbytes) > LSM_HOOK(int, 0, ismaclabel, const char *name) > LSM_HOOK(int, -EOPNOTSUPP, secid_to_secctx, u32 secid, char **secdata, > u32 *seclen) > diff --git a/include/linux/security.h b/include/linux/security.h > index 96a63e132abf..1f1a9696e65d 100644 > --- a/include/linux/security.h > +++ b/include/linux/security.h > @@ -496,7 +496,8 @@ int security_setselfattr(unsigned int attr, struct lsm_ctx __user *ctx, > u32 size, u32 flags); > int security_getprocattr(struct task_struct *p, int lsmid, const char *name, > char **value); > -int security_setprocattr(int lsmid, const char *name, void *value, size_t size); > +int security_setprocattr(int lsmid, const char *name, void *value, size_t size, > + size_t *wbytes); > int security_netlink_send(struct sock *sk, struct sk_buff *skb); > int security_ismaclabel(const char *name); > int security_secid_to_secctx(u32 secid, char **secdata, u32 *seclen); > @@ -1440,7 +1441,7 @@ static inline int security_getprocattr(struct task_struct *p, int lsmid, > } > > static inline int security_setprocattr(int lsmid, char *name, void *value, > - size_t size) > + size_t size, size_t *wbytes) > { > return -EINVAL; > } > diff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c > index 72dd09993f28..6c8b1f8c5781 100644 > --- a/security/apparmor/lsm.c > +++ b/security/apparmor/lsm.c > @@ -939,13 +939,17 @@ static int apparmor_setselfattr(unsigned int attr, struct lsm_ctx *ctx, > } > > static int apparmor_setprocattr(const char *name, void *value, > - size_t size) > + size_t size, size_t *wbytes) > { > + int rc = -EINVAL; > int attr = lsm_name_to_attr(name); > > if (attr) > - return do_setattr(attr, value, size); > - return -EINVAL; > + rc = do_setattr(attr, value, size); > + if (rc < 0) > + return rc; > + *wbytes = rc; > + return 0; > } > > /** > diff --git a/security/security.c b/security/security.c > index 095e78efcb32..9685096dbf16 100644 > --- a/security/security.c > +++ b/security/security.c > @@ -4141,20 +4141,22 @@ int security_getprocattr(struct task_struct *p, int lsmid, const char *name, > * @name: attribute name > * @value: attribute value > * @size: attribute value size > + * @wbytes: bytes written on success > * > * Write (set) the current task's attribute @name to @value, size @size if > * allowed. > * > - * Return: Returns bytes written on success, a negative value otherwise. > + * Return: Returns 0 on success, a negative error code otherwise. > */ > -int security_setprocattr(int lsmid, const char *name, void *value, size_t size) > +int security_setprocattr(int lsmid, const char *name, void *value, size_t size, > + size_t *wbytes) > { > struct security_hook_list *hp; > > hlist_for_each_entry(hp, &security_hook_heads.setprocattr, list) { > if (lsmid != 0 && lsmid != hp->lsmid->id) > continue; > - return hp->hook.setprocattr(name, value, size); > + return hp->hook.setprocattr(name, value, size, wbytes); > } > return LSM_RET_DEFAULT(setprocattr); > } > diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c > index 0d35bb93baca..7a73f3710025 100644 > --- a/security/selinux/hooks.c > +++ b/security/selinux/hooks.c > @@ -6589,13 +6589,18 @@ static int selinux_getprocattr(struct task_struct *p, > return -EINVAL; > } > > -static int selinux_setprocattr(const char *name, void *value, size_t size) > +static int selinux_setprocattr(const char *name, void *value, size_t size, > + size_t *wbytes) > { > + int rc = -EINVAL; > int attr = lsm_name_to_attr(name); > > if (attr) > - return selinux_lsm_setattr(attr, value, size); > - return -EINVAL; > + rc = selinux_lsm_setattr(attr, value, size); > + if (rc < 0) > + return rc; > + *wbytes = rc; > + return 0; > } > > static int selinux_ismaclabel(const char *name) > diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c > index 63d9c5f456c1..4265f2639106 100644 > --- a/security/smack/smack_lsm.c > +++ b/security/smack/smack_lsm.c > @@ -3797,19 +3797,25 @@ static int smack_setselfattr(unsigned int attr, struct lsm_ctx *ctx, > * @name: the name of the attribute in /proc/.../attr > * @value: the value to set > * @size: the size of the value > + * @wbytes: the length of the smack label written > * > * Sets the Smack value of the task. Only setting self > * is permitted and only with privilege > * > - * Returns the length of the smack label or an error code > + * Returns 0 on success or a negative error code > */ > -static int smack_setprocattr(const char *name, void *value, size_t size) > +static int smack_setprocattr(const char *name, void *value, size_t size, > + size_t *wbytes) > { > + int rc = -EINVAL; > int attr = lsm_name_to_attr(name); > > if (attr != LSM_ATTR_UNDEF) > - return do_setattr(attr, value, size); > - return -EINVAL; > + rc = do_setattr(attr, value, size); > + if (rc < 0) > + return rc; > + *wbytes = rc; > + return 0; > } > > /** > -- > 2.30.2 -- paul-moore.com