* [PATCH 1/2] Bluetooth: Rename l2cap_check_security()
@ 2011-11-07 14:45 Gustavo F. Padovan
2011-11-07 14:45 ` [PATCH 2/2] Bluetooth: Allow L2CAP to increase the security level Gustavo F. Padovan
2011-11-07 23:56 ` [PATCH 1/2] Bluetooth: Rename l2cap_check_security() Marcel Holtmann
0 siblings, 2 replies; 5+ messages in thread
From: Gustavo F. Padovan @ 2011-11-07 14:45 UTC (permalink / raw)
To: linux-bluetooth; +Cc: Gustavo F. Padovan
From: "Gustavo F. Padovan" <padovan@profusion.mobi>
rename to l2cap_chan_check_security() to make it consistent with other
l2cap_exported functions. This function will be exported in a later
commit.
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
---
net/bluetooth/l2cap_core.c | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index 1200814..793971c 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -516,7 +516,7 @@ static inline u8 l2cap_get_auth_type(struct l2cap_chan *chan)
}
/* Service level security */
-static inline int l2cap_check_security(struct l2cap_chan *chan)
+static inline int l2cap_chan_check_security(struct l2cap_chan *chan)
{
struct l2cap_conn *conn = chan->conn;
__u8 auth_type;
@@ -662,7 +662,7 @@ static void l2cap_do_start(struct l2cap_chan *chan)
if (!(conn->info_state & L2CAP_INFO_FEAT_MASK_REQ_DONE))
return;
- if (l2cap_check_security(chan) &&
+ if (l2cap_chan_check_security(chan) &&
__l2cap_no_conn_pending(chan)) {
struct l2cap_conn_req req;
req.scid = cpu_to_le16(chan->scid);
@@ -752,7 +752,7 @@ static void l2cap_conn_start(struct l2cap_conn *conn)
if (chan->state == BT_CONNECT) {
struct l2cap_conn_req req;
- if (!l2cap_check_security(chan) ||
+ if (!l2cap_chan_check_security(chan) ||
!__l2cap_no_conn_pending(chan)) {
bh_unlock_sock(sk);
continue;
@@ -785,7 +785,7 @@ static void l2cap_conn_start(struct l2cap_conn *conn)
rsp.scid = cpu_to_le16(chan->dcid);
rsp.dcid = cpu_to_le16(chan->scid);
- if (l2cap_check_security(chan)) {
+ if (l2cap_chan_check_security(chan)) {
if (bt_sk(sk)->defer_setup) {
struct sock *parent = bt_sk(sk)->parent;
rsp.result = cpu_to_le16(L2CAP_CR_PEND);
@@ -1179,7 +1179,7 @@ int l2cap_chan_connect(struct l2cap_chan *chan)
if (hcon->state == BT_CONNECTED) {
if (chan->chan_type != L2CAP_CHAN_CONN_ORIENTED) {
__clear_chan_timer(chan);
- if (l2cap_check_security(chan))
+ if (l2cap_chan_check_security(chan))
l2cap_state_change(chan, BT_CONNECTED);
} else
l2cap_do_start(chan);
@@ -2580,7 +2580,7 @@ static inline int l2cap_connect_req(struct l2cap_conn *conn, struct l2cap_cmd_hd
chan->ident = cmd->ident;
if (conn->info_state & L2CAP_INFO_FEAT_MASK_REQ_DONE) {
- if (l2cap_check_security(chan)) {
+ if (l2cap_chan_check_security(chan)) {
if (bt_sk(sk)->defer_setup) {
l2cap_state_change(chan, BT_CONNECT2);
result = L2CAP_CR_PEND;
--
1.7.6.4
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH 2/2] Bluetooth: Allow L2CAP to increase the security level
2011-11-07 14:45 [PATCH 1/2] Bluetooth: Rename l2cap_check_security() Gustavo F. Padovan
@ 2011-11-07 14:45 ` Gustavo F. Padovan
2011-11-07 23:59 ` Marcel Holtmann
2011-11-07 23:56 ` [PATCH 1/2] Bluetooth: Rename l2cap_check_security() Marcel Holtmann
1 sibling, 1 reply; 5+ messages in thread
From: Gustavo F. Padovan @ 2011-11-07 14:45 UTC (permalink / raw)
To: linux-bluetooth; +Cc: Gustavo F. Padovan
From: "Gustavo F. Padovan" <padovan@profusion.mobi>
Some incomming connections needs to increase the security level by
requesting encryption for example (HID keyboard case). This change allows
the userspace to change it through setsockopt with defer_setup enabled.
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
---
include/net/bluetooth/l2cap.h | 1 +
net/bluetooth/l2cap_core.c | 2 +-
net/bluetooth/l2cap_sock.c | 13 ++++++++++---
3 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h
index fdb2b78..5ff38e9 100644
--- a/include/net/bluetooth/l2cap.h
+++ b/include/net/bluetooth/l2cap.h
@@ -810,5 +810,6 @@ int l2cap_chan_connect(struct l2cap_chan *chan);
int l2cap_chan_send(struct l2cap_chan *chan, struct msghdr *msg, size_t len,
u32 priority);
void l2cap_chan_busy(struct l2cap_chan *chan, int busy);
+int l2cap_chan_check_security(struct l2cap_chan *chan);
#endif /* __L2CAP_H */
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index 793971c..6a5c1b2 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -516,7 +516,7 @@ static inline u8 l2cap_get_auth_type(struct l2cap_chan *chan)
}
/* Service level security */
-static inline int l2cap_chan_check_security(struct l2cap_chan *chan)
+int l2cap_chan_check_security(struct l2cap_chan *chan)
{
struct l2cap_conn *conn = chan->conn;
__u8 auth_type;
diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c
index 664762e..b58f40c 100644
--- a/net/bluetooth/l2cap_sock.c
+++ b/net/bluetooth/l2cap_sock.c
@@ -623,8 +623,12 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname, ch
chan->sec_level = sec.level;
+ if (!chan->conn)
+ break;
+
conn = chan->conn;
- if (conn && chan->scid == L2CAP_CID_LE_DATA) {
+
+ if (chan->scid == L2CAP_CID_LE_DATA) {
if (!conn->hcon->out) {
err = -EINVAL;
break;
@@ -632,9 +636,12 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname, ch
if (smp_conn_security(conn, sec.level))
break;
-
- err = 0;
sk->sk_state = BT_CONFIG;
+ } else if (sk->sk_state == BT_CONNECT2 &&
+ bt_sk(sk)->defer_setup) {
+ err = l2cap_chan_check_security(chan);
+ } else {
+ err = -EINVAL;
}
break;
--
1.7.6.4
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH 2/2] Bluetooth: Allow L2CAP to increase the security level
2011-11-07 14:45 ` [PATCH 2/2] Bluetooth: Allow L2CAP to increase the security level Gustavo F. Padovan
@ 2011-11-07 23:59 ` Marcel Holtmann
2011-11-08 18:26 ` Gustavo Padovan
0 siblings, 1 reply; 5+ messages in thread
From: Marcel Holtmann @ 2011-11-07 23:59 UTC (permalink / raw)
To: Gustavo F. Padovan; +Cc: linux-bluetooth
Hi Gustavo,
> Some incomming connections needs to increase the security level by
> requesting encryption for example (HID keyboard case). This change allows
> the userspace to change it through setsockopt with defer_setup enabled.
>
> Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
> ---
> include/net/bluetooth/l2cap.h | 1 +
> net/bluetooth/l2cap_core.c | 2 +-
> net/bluetooth/l2cap_sock.c | 13 ++++++++++---
> 3 files changed, 12 insertions(+), 4 deletions(-)
>
> diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h
> index fdb2b78..5ff38e9 100644
> --- a/include/net/bluetooth/l2cap.h
> +++ b/include/net/bluetooth/l2cap.h
> @@ -810,5 +810,6 @@ int l2cap_chan_connect(struct l2cap_chan *chan);
> int l2cap_chan_send(struct l2cap_chan *chan, struct msghdr *msg, size_t len,
> u32 priority);
> void l2cap_chan_busy(struct l2cap_chan *chan, int busy);
> +int l2cap_chan_check_security(struct l2cap_chan *chan);
>
> #endif /* __L2CAP_H */
> diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
> index 793971c..6a5c1b2 100644
> --- a/net/bluetooth/l2cap_core.c
> +++ b/net/bluetooth/l2cap_core.c
> @@ -516,7 +516,7 @@ static inline u8 l2cap_get_auth_type(struct l2cap_chan *chan)
> }
>
> /* Service level security */
> -static inline int l2cap_chan_check_security(struct l2cap_chan *chan)
> +int l2cap_chan_check_security(struct l2cap_chan *chan)
> {
> struct l2cap_conn *conn = chan->conn;
> __u8 auth_type;
> diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c
> index 664762e..b58f40c 100644
> --- a/net/bluetooth/l2cap_sock.c
> +++ b/net/bluetooth/l2cap_sock.c
> @@ -623,8 +623,12 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname, ch
>
> chan->sec_level = sec.level;
>
> + if (!chan->conn)
> + break;
> +
> conn = chan->conn;
is this fixing a real bug? Can chan->conn really be NULL?
> - if (conn && chan->scid == L2CAP_CID_LE_DATA) {
> +
> + if (chan->scid == L2CAP_CID_LE_DATA) {
> if (!conn->hcon->out) {
> err = -EINVAL;
> break;
> @@ -632,9 +636,12 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname, ch
>
> if (smp_conn_security(conn, sec.level))
> break;
> -
> - err = 0;
> sk->sk_state = BT_CONFIG;
> + } else if (sk->sk_state == BT_CONNECT2 &&
> + bt_sk(sk)->defer_setup) {
> + err = l2cap_chan_check_security(chan);
> + } else {
> + err = -EINVAL;
> }
> break;
>
You might wanna add some comments here on what each if block is for.
This becomes a complex statements and we need comments here to keep us
sane.
Regards
Marcel
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH 2/2] Bluetooth: Allow L2CAP to increase the security level
2011-11-07 23:59 ` Marcel Holtmann
@ 2011-11-08 18:26 ` Gustavo Padovan
0 siblings, 0 replies; 5+ messages in thread
From: Gustavo Padovan @ 2011-11-08 18:26 UTC (permalink / raw)
To: Marcel Holtmann; +Cc: linux-bluetooth
Hi Marcel,
* Marcel Holtmann <marcel@holtmann.org> [2011-11-08 08:59:15 +0900]:
> Hi Gustavo,
>
> > Some incomming connections needs to increase the security level by
> > requesting encryption for example (HID keyboard case). This change allows
> > the userspace to change it through setsockopt with defer_setup enabled.
> >
> > Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
> > ---
> > include/net/bluetooth/l2cap.h | 1 +
> > net/bluetooth/l2cap_core.c | 2 +-
> > net/bluetooth/l2cap_sock.c | 13 ++++++++++---
> > 3 files changed, 12 insertions(+), 4 deletions(-)
> >
> > diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h
> > index fdb2b78..5ff38e9 100644
> > --- a/include/net/bluetooth/l2cap.h
> > +++ b/include/net/bluetooth/l2cap.h
> > @@ -810,5 +810,6 @@ int l2cap_chan_connect(struct l2cap_chan *chan);
> > int l2cap_chan_send(struct l2cap_chan *chan, struct msghdr *msg, size_t len,
> > u32 priority);
> > void l2cap_chan_busy(struct l2cap_chan *chan, int busy);
> > +int l2cap_chan_check_security(struct l2cap_chan *chan);
> >
> > #endif /* __L2CAP_H */
> > diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
> > index 793971c..6a5c1b2 100644
> > --- a/net/bluetooth/l2cap_core.c
> > +++ b/net/bluetooth/l2cap_core.c
> > @@ -516,7 +516,7 @@ static inline u8 l2cap_get_auth_type(struct l2cap_chan *chan)
> > }
> >
> > /* Service level security */
> > -static inline int l2cap_chan_check_security(struct l2cap_chan *chan)
> > +int l2cap_chan_check_security(struct l2cap_chan *chan)
> > {
> > struct l2cap_conn *conn = chan->conn;
> > __u8 auth_type;
> > diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c
> > index 664762e..b58f40c 100644
> > --- a/net/bluetooth/l2cap_sock.c
> > +++ b/net/bluetooth/l2cap_sock.c
> > @@ -623,8 +623,12 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname, ch
> >
> > chan->sec_level = sec.level;
> >
> > + if (!chan->conn)
> > + break;
> > +
> > conn = chan->conn;
>
> is this fixing a real bug? Can chan->conn really be NULL?
Not really fixing, this check was here before. For LE only make senes call
smp_conn_security() if a conn exists and the goes for
l2cap_chan_check_security().
>
> > - if (conn && chan->scid == L2CAP_CID_LE_DATA) {
> > +
> > + if (chan->scid == L2CAP_CID_LE_DATA) {
> > if (!conn->hcon->out) {
> > err = -EINVAL;
> > break;
> > @@ -632,9 +636,12 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname, ch
> >
> > if (smp_conn_security(conn, sec.level))
> > break;
> > -
> > - err = 0;
> > sk->sk_state = BT_CONFIG;
> > + } else if (sk->sk_state == BT_CONNECT2 &&
> > + bt_sk(sk)->defer_setup) {
> > + err = l2cap_chan_check_security(chan);
> > + } else {
> > + err = -EINVAL;
> > }
> > break;
> >
>
> You might wanna add some comments here on what each if block is for.
> This becomes a complex statements and we need comments here to keep us
> sane.
Sure.
Gustavo
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 1/2] Bluetooth: Rename l2cap_check_security()
2011-11-07 14:45 [PATCH 1/2] Bluetooth: Rename l2cap_check_security() Gustavo F. Padovan
2011-11-07 14:45 ` [PATCH 2/2] Bluetooth: Allow L2CAP to increase the security level Gustavo F. Padovan
@ 2011-11-07 23:56 ` Marcel Holtmann
1 sibling, 0 replies; 5+ messages in thread
From: Marcel Holtmann @ 2011-11-07 23:56 UTC (permalink / raw)
To: Gustavo F. Padovan; +Cc: linux-bluetooth
Hi Gustavo,
> rename to l2cap_chan_check_security() to make it consistent with other
> l2cap_exported functions. This function will be exported in a later
> commit.
export it right away in this commit as well. Having it exported by the
commit that also uses this is the wrong separation.
> Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
> ---
> net/bluetooth/l2cap_core.c | 12 ++++++------
> 1 files changed, 6 insertions(+), 6 deletions(-)
Otherwise.
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Regards
Marcel
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2011-11-08 18:26 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-11-07 14:45 [PATCH 1/2] Bluetooth: Rename l2cap_check_security() Gustavo F. Padovan
2011-11-07 14:45 ` [PATCH 2/2] Bluetooth: Allow L2CAP to increase the security level Gustavo F. Padovan
2011-11-07 23:59 ` Marcel Holtmann
2011-11-08 18:26 ` Gustavo Padovan
2011-11-07 23:56 ` [PATCH 1/2] Bluetooth: Rename l2cap_check_security() Marcel Holtmann
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).