lkml.org 
[lkml]   [2013]   [Apr]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[ 102/171 ] NFSv4: Fix the string length returned by the idmapper
    3.6.11.2 stable review patch.
    If anyone has any objections, please let me know.

    ------------------

    From: Trond Myklebust <Trond.Myklebust@netapp.com>

    [ Upstream commit cf4ab538f1516606d3ae730dce15d6f33d96b7e1 ]

    Functions like nfs_map_uid_to_name() and nfs_map_gid_to_group() are
    expected to return a string without any terminating NUL character.
    Regression introduced by commit 57e62324e469e092ecc6c94a7a86fe4bd6ac5172
    (NFS: Store the legacy idmapper result in the keyring).

    Reported-by: Dave Chiluk <dave.chiluk@canonical.com>
    Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
    Cc: Bryan Schumaker <bjschuma@netapp.com>
    Cc: stable@vger.kernel.org [>=3.4]
    Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
    ---
    fs/nfs/idmap.c | 13 ++++++++-----
    1 file changed, 8 insertions(+), 5 deletions(-)

    diff --git a/fs/nfs/idmap.c b/fs/nfs/idmap.c
    index a850079..e720df5 100644
    --- a/fs/nfs/idmap.c
    +++ b/fs/nfs/idmap.c
    @@ -707,9 +707,9 @@ out1:
    return ret;
    }

    -static int nfs_idmap_instantiate(struct key *key, struct key *authkey, char *data)
    +static int nfs_idmap_instantiate(struct key *key, struct key *authkey, char *data, size_t datalen)
    {
    - return key_instantiate_and_link(key, data, strlen(data) + 1,
    + return key_instantiate_and_link(key, data, datalen,
    id_resolver_cache->thread_keyring,
    authkey);
    }
    @@ -717,15 +717,18 @@ static int nfs_idmap_instantiate(struct key *key, struct key *authkey, char *dat
    static int nfs_idmap_read_message(struct idmap_msg *im, struct key *key, struct key *authkey)
    {
    char id_str[NFS_UINT_MAXLEN];
    + size_t len;
    int ret = -EINVAL;

    switch (im->im_conv) {
    case IDMAP_CONV_NAMETOID:
    - sprintf(id_str, "%d", im->im_id);
    - ret = nfs_idmap_instantiate(key, authkey, id_str);
    + /* Note: here we store the NUL terminator too */
    + len = sprintf(id_str, "%d", im->im_id) + 1;
    + ret = nfs_idmap_instantiate(key, authkey, id_str, len);
    break;
    case IDMAP_CONV_IDTONAME:
    - ret = nfs_idmap_instantiate(key, authkey, im->im_name);
    + len = strlen(im->im_name);
    + ret = nfs_idmap_instantiate(key, authkey, im->im_name, len);
    break;
    }

    --
    1.7.10.4



    \
     
     \ /
      Last update: 2013-04-12 00:41    [W:4.537 / U:0.272 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site