lkml.org 
[lkml]   [2018]   [Feb]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 3.16 024/136] IB/srpt: Do not accept invalid initiator port names
    3.16.54-rc1 review patch.  If anyone has any objections, please let me know.

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

    From: Bart Van Assche <bart.vanassche@wdc.com>

    commit c70ca38960399a63d5c048b7b700612ea321d17e upstream.

    Make srpt_parse_i_port_id() return a negative value if hex2bin()
    fails.

    Fixes: commit a42d985bd5b2 ("ib_srpt: Initial SRP Target merge for v3.3-rc1")
    Signed-off-by: Bart Van Assche <bart.vanassche@wdc.com>
    Signed-off-by: Doug Ledford <dledford@redhat.com>
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    drivers/infiniband/ulp/srpt/ib_srpt.c | 9 ++++-----
    1 file changed, 4 insertions(+), 5 deletions(-)

    --- a/drivers/infiniband/ulp/srpt/ib_srpt.c
    +++ b/drivers/infiniband/ulp/srpt/ib_srpt.c
    @@ -3521,7 +3521,7 @@ static int srpt_parse_i_port_id(u8 i_por
    {
    const char *p;
    unsigned len, count, leading_zero_bytes;
    - int ret, rc;
    + int ret;

    p = name;
    if (strnicmp(p, "0x", 2) == 0)
    @@ -3533,10 +3533,9 @@ static int srpt_parse_i_port_id(u8 i_por
    count = min(len / 2, 16U);
    leading_zero_bytes = 16 - count;
    memset(i_port_id, 0, leading_zero_bytes);
    - rc = hex2bin(i_port_id + leading_zero_bytes, p, count);
    - if (rc < 0)
    - pr_debug("hex2bin failed for srpt_parse_i_port_id: %d\n", rc);
    - ret = 0;
    + ret = hex2bin(i_port_id + leading_zero_bytes, p, count);
    + if (ret < 0)
    + pr_debug("hex2bin failed for srpt_parse_i_port_id: %d\n", ret);
    out:
    return ret;
    }
    \
     
     \ /
      Last update: 2018-02-11 06:21    [W:2.405 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site