lkml.org 
[lkml]   [2017]   [Nov]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.10 007/139] Bluetooth: cmtp: cmtp_add_connection() should verify that it's dealing with l2cap socket
    Date
    From: Al Viro <viro@zeniv.linux.org.uk>

    commit 96c26653ce65bf84f3212f8b00d4316c1efcbf4c upstream.

    ... rather than relying on ciptool(8) never passing it anything else. Give
    it e.g. an AF_UNIX connected socket (from socketpair(2)) and it'll oops,
    trying to evaluate &l2cap_pi(sock->sk)->chan->dst...

    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
    Signed-off-by: Willy Tarreau <w@1wt.eu>
    ---
    net/bluetooth/cmtp/core.c | 3 +++
    1 file changed, 3 insertions(+)

    diff --git a/net/bluetooth/cmtp/core.c b/net/bluetooth/cmtp/core.c
    index e0a6ebf..84460f6 100644
    --- a/net/bluetooth/cmtp/core.c
    +++ b/net/bluetooth/cmtp/core.c
    @@ -334,6 +334,9 @@ int cmtp_add_connection(struct cmtp_connadd_req *req, struct socket *sock)

    BT_DBG("");

    + if (!l2cap_is_socket(sock))
    + return -EBADFD;
    +
    session = kzalloc(sizeof(struct cmtp_session), GFP_KERNEL);
    if (!session)
    return -ENOMEM;
    --
    2.8.0.rc2.1.gbe9624a
    \
     
     \ /
      Last update: 2017-11-01 22:22    [W:4.833 / U:0.052 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site