lkml.org 
[lkml]   [2022]   [Feb]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.16 02/52] NFSv4 only print the label when its queried
    Date
    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 69862bf6db001..801119b7a5964 100644
    --- a/fs/nfs/nfs4xdr.c
    +++ b/fs/nfs/nfs4xdr.c
    @@ -4200,10 +4200,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
    \
     
     \ /
      Last update: 2022-02-03 21:30    [W:4.330 / U:0.024 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site