lkml.org 
[lkml]   [2021]   [Jul]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.12 232/700] smb3: fix uninitialized value for port in witness protocol move
    Date
    From: Steve French <stfrench@microsoft.com>

    [ Upstream commit ff93b71a3eff25fe9d4364ef13b6e01d935600c6 ]

    Although in practice this can not occur (since IPv4 and IPv6 are the
    only two cases currently supported), it is cleaner to avoid uninitialized
    variable warnings.

    Addresses smatch warning:
    fs/cifs/cifs_swn.c:468 cifs_swn_store_swn_addr() error: uninitialized symbol 'port'.

    Reported-by: kernel test robot <lkp@intel.com>
    Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
    CC: Samuel Cabrero <scabrero@suse.de>
    Signed-off-by: Steve French <stfrench@microsoft.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    fs/cifs/cifs_swn.c | 10 +++-------
    1 file changed, 3 insertions(+), 7 deletions(-)

    diff --git a/fs/cifs/cifs_swn.c b/fs/cifs/cifs_swn.c
    index d829b8bf833e..93b47818c6c2 100644
    --- a/fs/cifs/cifs_swn.c
    +++ b/fs/cifs/cifs_swn.c
    @@ -447,15 +447,13 @@ static int cifs_swn_store_swn_addr(const struct sockaddr_storage *new,
    const struct sockaddr_storage *old,
    struct sockaddr_storage *dst)
    {
    - __be16 port;
    + __be16 port = cpu_to_be16(CIFS_PORT);

    if (old->ss_family == AF_INET) {
    struct sockaddr_in *ipv4 = (struct sockaddr_in *)old;

    port = ipv4->sin_port;
    - }
    -
    - if (old->ss_family == AF_INET6) {
    + } else if (old->ss_family == AF_INET6) {
    struct sockaddr_in6 *ipv6 = (struct sockaddr_in6 *)old;

    port = ipv6->sin6_port;
    @@ -465,9 +463,7 @@ static int cifs_swn_store_swn_addr(const struct sockaddr_storage *new,
    struct sockaddr_in *ipv4 = (struct sockaddr_in *)new;

    ipv4->sin_port = port;
    - }
    -
    - if (new->ss_family == AF_INET6) {
    + } else if (new->ss_family == AF_INET6) {
    struct sockaddr_in6 *ipv6 = (struct sockaddr_in6 *)new;

    ipv6->sin6_port = port;
    --
    2.30.2


    \
     
     \ /
      Last update: 2021-07-12 09:40    [W:2.090 / U:0.340 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site