lkml.org 
[lkml]   [2021]   [Jul]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.12 140/242] Bluetooth: L2CAP: Fix invalid access if ECRED Reconfigure fails
    Date
    From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>

    [ Upstream commit 1fa20d7d4aad02206e84b74915819fbe9f81dab3 ]

    The use of l2cap_chan_del is not safe under a loop using
    list_for_each_entry.

    Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
    Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
    Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    net/bluetooth/l2cap_core.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
    index 53ddbee459b9..015f9ecadd0a 100644
    --- a/net/bluetooth/l2cap_core.c
    +++ b/net/bluetooth/l2cap_core.c
    @@ -6244,7 +6244,7 @@ static inline int l2cap_ecred_reconf_rsp(struct l2cap_conn *conn,
    struct l2cap_cmd_hdr *cmd, u16 cmd_len,
    u8 *data)
    {
    - struct l2cap_chan *chan;
    + struct l2cap_chan *chan, *tmp;
    struct l2cap_ecred_conn_rsp *rsp = (void *) data;
    u16 result;

    @@ -6258,7 +6258,7 @@ static inline int l2cap_ecred_reconf_rsp(struct l2cap_conn *conn,
    if (!result)
    return 0;

    - list_for_each_entry(chan, &conn->chan_l, list) {
    + list_for_each_entry_safe(chan, tmp, &conn->chan_l, list) {
    if (chan->ident != cmd->ident)
    continue;

    --
    2.30.2


    \
     
     \ /
      Last update: 2021-07-15 21:14    [W:4.112 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site