| Message ID | 1426753191-9468-1-git-send-email-harish_kandiga@mentor.com |
|---|---|
| State | Awaiting Upstream, archived |
| Delegated to: | David Miller |
| Headers | show |
Hello. On 3/19/2015 11:19 AM, Harish Jenny K N wrote: > There is a potential use after free in bt_sock_poll when a > socket gets killed without getting unlinked from accept_q. > Hence added code to unlink from accpept_q by calling teardown > before freeing the socket for channel type L2CAP_CHAN_CONN_ORIENTED. > Signed-off-by: Harish Jenny K N <harish_kandiga@mentor.com> > --- > net/bluetooth/l2cap_core.c | 5 +++++ > 1 file changed, 5 insertions(+) > diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c > index 6ba33f9..c6955fb 100644 > --- a/net/bluetooth/l2cap_core.c > +++ b/net/bluetooth/l2cap_core.c > @@ -415,6 +415,11 @@ static void l2cap_chan_timeout(struct work_struct *work) > > l2cap_chan_close(chan, reason); > > + if ((chan->state == BT_CONNECTED || chan->state == BT_CONFIG) && > + chan->chan_type == L2CAP_CHAN_CONN_ORIENTED) { > + chan->ops->teardown(chan, 0); > + } > + {} not needed here. [...] WBR, Sergei -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c index 6ba33f9..c6955fb 100644 --- a/net/bluetooth/l2cap_core.c +++ b/net/bluetooth/l2cap_core.c @@ -415,6 +415,11 @@ static void l2cap_chan_timeout(struct work_struct *work) l2cap_chan_close(chan, reason); + if ((chan->state == BT_CONNECTED || chan->state == BT_CONFIG) && + chan->chan_type == L2CAP_CHAN_CONN_ORIENTED) { + chan->ops->teardown(chan, 0); + } + l2cap_chan_unlock(chan); chan->ops->close(chan);
There is a potential use after free in bt_sock_poll when a socket gets killed without getting unlinked from accept_q. Hence added code to unlink from accpept_q by calling teardown before freeing the socket for channel type L2CAP_CHAN_CONN_ORIENTED. Signed-off-by: Harish Jenny K N <harish_kandiga@mentor.com> --- net/bluetooth/l2cap_core.c | 5 +++++ 1 file changed, 5 insertions(+)