From: Olga Kornievskaia <kolga@netapp.com>

Date: Mon, 29 Nov 2021 15:33:56 -0500

Subject: [PATCH] NFSv4 only print the label when its queried

Git-commit: 2c52c8376db7160a1dd8a681c61c9258405ef143

Patch-mainline: v5.17

References: git-fixes

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>

Acked-by: NeilBrown <neilb@suse.com>

---

 fs/nfs/nfs4xdr.c |    7 ++++---

 1 file changed, 4 insertions(+), 3 deletions(-)

--- a/fs/nfs/nfs4xdr.c

+++ b/fs/nfs/nfs4xdr.c

@@ -4183,10 +4183,11 @@ static int decode_attr_security_label(st

 		} 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;

 out_overflow: