| From 8a2c093bcd7e5c22d82a115a436f347f48bee2c6 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Mon, 29 Nov 2021 15:33:56 -0500 |
| Subject: NFSv4 only print the label when its queried |
| |
| From: Olga Kornievskaia <kolga@netapp.com> |
| |
| [ Upstream commit 2c52c8376db7160a1dd8a681c61c9258405ef143 ] |
| |
| When the bitmask of the attributes doesn't include the security label, |
| don't bother printing it. Since the label might not be null terminated, |
| adjust the printing format accordingly. |
| |
| Signed-off-by: Olga Kornievskaia <kolga@netapp.com> |
| Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| fs/nfs/nfs4xdr.c | 7 ++++--- |
| 1 file changed, 4 insertions(+), 3 deletions(-) |
| |
| diff --git a/fs/nfs/nfs4xdr.c b/fs/nfs/nfs4xdr.c |
| index a8cff19c6f00c..5e886518f2d45 100644 |
| --- a/fs/nfs/nfs4xdr.c |
| +++ b/fs/nfs/nfs4xdr.c |
| @@ -4197,10 +4197,11 @@ static int decode_attr_security_label(struct xdr_stream *xdr, uint32_t *bitmap, |
| } else |
| printk(KERN_WARNING "%s: label too long (%u)!\n", |
| __func__, len); |
| + if (label && label->label) |
| + dprintk("%s: label=%.*s, len=%d, PI=%d, LFS=%d\n", |
| + __func__, label->len, (char *)label->label, |
| + label->len, label->pi, label->lfs); |
| } |
| - if (label && label->label) |
| - dprintk("%s: label=%s, len=%d, PI=%d, LFS=%d\n", __func__, |
| - (char *)label->label, label->len, label->pi, label->lfs); |
| return status; |
| } |
| |
| -- |
| 2.34.1 |
| |
