lkml.org 
[lkml]   [2019]   [Jul]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 004/293] scsi: iscsi: set auth_protocol back to NULL if CHAP_A value is not supported
    Date
    [ Upstream commit 5dd6c49339126c2c8df2179041373222362d6e49 ]

    If the CHAP_A value is not supported, the chap_server_open() function
    should free the auth_protocol pointer and set it to NULL, or we will leave
    a dangling pointer around.

    [ 66.010905] Unsupported CHAP_A value
    [ 66.011660] Security negotiation failed.
    [ 66.012443] iSCSI Login negotiation failed.
    [ 68.413924] general protection fault: 0000 [#1] SMP PTI
    [ 68.414962] CPU: 0 PID: 1562 Comm: targetcli Kdump: loaded Not tainted 4.18.0-80.el8.x86_64 #1
    [ 68.416589] Hardware name: Red Hat KVM, BIOS 0.5.1 01/01/2011
    [ 68.417677] RIP: 0010:__kmalloc_track_caller+0xc2/0x210

    Signed-off-by: Maurizio Lombardi <mlombard@redhat.com>
    Reviewed-by: Chris Leech <cleech@redhat.com>
    Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/target/iscsi/iscsi_target_auth.c | 16 ++++++++--------
    1 file changed, 8 insertions(+), 8 deletions(-)

    diff --git a/drivers/target/iscsi/iscsi_target_auth.c b/drivers/target/iscsi/iscsi_target_auth.c
    index 4e680d753941..e2fa3a3bc81d 100644
    --- a/drivers/target/iscsi/iscsi_target_auth.c
    +++ b/drivers/target/iscsi/iscsi_target_auth.c
    @@ -89,6 +89,12 @@ static int chap_check_algorithm(const char *a_str)
    return CHAP_DIGEST_UNKNOWN;
    }

    +static void chap_close(struct iscsi_conn *conn)
    +{
    + kfree(conn->auth_protocol);
    + conn->auth_protocol = NULL;
    +}
    +
    static struct iscsi_chap *chap_server_open(
    struct iscsi_conn *conn,
    struct iscsi_node_auth *auth,
    @@ -126,7 +132,7 @@ static struct iscsi_chap *chap_server_open(
    case CHAP_DIGEST_UNKNOWN:
    default:
    pr_err("Unsupported CHAP_A value\n");
    - kfree(conn->auth_protocol);
    + chap_close(conn);
    return NULL;
    }

    @@ -141,19 +147,13 @@ static struct iscsi_chap *chap_server_open(
    * Generate Challenge.
    */
    if (chap_gen_challenge(conn, 1, aic_str, aic_len) < 0) {
    - kfree(conn->auth_protocol);
    + chap_close(conn);
    return NULL;
    }

    return chap;
    }

    -static void chap_close(struct iscsi_conn *conn)
    -{
    - kfree(conn->auth_protocol);
    - conn->auth_protocol = NULL;
    -}
    -
    static int chap_server_compute_md5(
    struct iscsi_conn *conn,
    struct iscsi_node_auth *auth,
    --
    2.20.1


    \
     
     \ /
      Last update: 2019-07-29 21:25    [W:4.298 / U:0.064 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site