Resend: [PATCH] Bluetooth: Fix Endian Bug.

Subsystems: bluetooth subsystem, the rest

4 messages, 2 authors, 2012-03-02 · open the first message on its own page

Resend: [PATCH] Bluetooth: Fix Endian Bug.

From: santosh nayak <hidden>
Date: 2012-03-01 11:00:12 

From: Santosh Nayak <redacted>

Fix for endian bug.

Fix for null dereferenced removed as it is already
submitted by Andrei.

Signed-off-by: Santosh Nayak <redacted>
---
 net/bluetooth/l2cap_sock.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c
index 401d942..86d5067 100644
--- a/net/bluetooth/l2cap_sock.c
+++ b/net/bluetooth/l2cap_sock.c
@@ -82,7 +82,7 @@ static int l2cap_sock_bind(struct socket *sock, struct sockaddr *addr, int alen)
 	}
 
 	if (la.l2_cid)
-		err = l2cap_add_scid(chan, la.l2_cid);
+		err = l2cap_add_scid(chan, __le16_to_cpu(la.l2_cid));
 	else
 		err = l2cap_add_psm(chan, &la.l2_bdaddr, la.l2_psm);
 
@@ -123,7 +123,8 @@ static int l2cap_sock_connect(struct socket *sock, struct sockaddr *addr, int al
 	if (la.l2_cid && la.l2_psm)
 		return -EINVAL;
 
-	err = l2cap_chan_connect(chan, la.l2_psm, la.l2_cid, &la.l2_bdaddr);
+	err = l2cap_chan_connect(chan, la.l2_psm, __le16_to_cpu(la.l2_cid),
+				&la.l2_bdaddr);
 	if (err)
 		goto done;
 
-- 
1.7.4.4

Re: Resend: [PATCH] Bluetooth: Fix Endian Bug.

From: Andrei Emeltchenko <hidden>
Date: 2012-03-01 12:36:47 

Hi Santosh,

On Thu, Mar 01, 2012 at 04:29:21PM +0530, santosh nayak wrote:
From: Santosh Nayak <redacted>

Fix for endian bug.

Fix for null dereferenced removed as it is already
submitted by Andrei.

Signed-off-by: Santosh Nayak <redacted>
---
 net/bluetooth/l2cap_sock.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)
We prefer following commit log (this is the example)

<------8<----------------------------------------------------------
|  From: Santosh Nayak [off-list ref]
|
|  Fix network to host endian conversion for L2CAP chan id.
|
|  Signed-off-by: Santosh Nayak [off-list ref]
|
|  ---
|          * v2 Fix for null dereferenced removed as it is already
|          submitted by Andrei.
|
|    net/bluetooth/l2cap_sock.c |    5 +++--
|    1 files changed, 3 insertions(+), 2 deletions(-)
|
<------8<----------------------------------------------------------
quoted hunk
diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c
index 401d942..86d5067 100644
--- a/net/bluetooth/l2cap_sock.c
+++ b/net/bluetooth/l2cap_sock.c
@@ -82,7 +82,7 @@ static int l2cap_sock_bind(struct socket *sock, struct sockaddr *addr, int alen)
 	}
 
 	if (la.l2_cid)
-		err = l2cap_add_scid(chan, la.l2_cid);
+		err = l2cap_add_scid(chan, __le16_to_cpu(la.l2_cid));
 	else
 		err = l2cap_add_psm(chan, &la.l2_bdaddr, la.l2_psm);
 
@@ -123,7 +123,8 @@ static int l2cap_sock_connect(struct socket *sock, struct sockaddr *addr, int al
 	if (la.l2_cid && la.l2_psm)
 		return -EINVAL;
 
-	err = l2cap_chan_connect(chan, la.l2_psm, la.l2_cid, &la.l2_bdaddr);
+	err = l2cap_chan_connect(chan, la.l2_psm, __le16_to_cpu(la.l2_cid),
+				&la.l2_bdaddr);
I live this to Marcel to decide should we reindent our code otherwise this
one looks odd.

Best regards 
Andrei Emeltchenko 





  

    
Re: Resend: [PATCH] Bluetooth: Fix Endian Bug.

    

      From: santosh prasad nayak <hidden>

      Date: 2012-03-01 14:05:00 
    

  

  
Andrei,

I could not get you.

Do you want me to resend the patch with subject,
  "[PATCH] Bluetooth: Fix network to host endian conversion for L2CAP
chan id."  ?



regards
santosh




On Thu, Mar 1, 2012 at 6:05 PM, Andrei Emeltchenko
[off-list ref] wrote:
Hi Santosh,

On Thu, Mar 01, 2012 at 04:29:21PM +0530, santosh nayak wrote:
quoted
From: Santosh Nayak <redacted>

Fix for endian bug.

Fix for null dereferenced removed as it is already
submitted by Andrei.

Signed-off-by: Santosh Nayak <redacted>
---
 net/bluetooth/l2cap_sock.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)
We prefer following commit log (this is the example)

<------8<----------------------------------------------------------
|  From: Santosh Nayak [off-list ref]
|
|  Fix network to host endian conversion for L2CAP chan id.
|
|  Signed-off-by: Santosh Nayak [off-list ref]
|
|  ---
|          * v2 Fix for null dereferenced removed as it is already
|          submitted by Andrei.
|
|    net/bluetooth/l2cap_sock.c |    5 +++--
|    1 files changed, 3 insertions(+), 2 deletions(-)
|
<------8<----------------------------------------------------------


quoted
diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c
index 401d942..86d5067 100644
--- a/net/bluetooth/l2cap_sock.c
+++ b/net/bluetooth/l2cap_sock.c
@@ -82,7 +82,7 @@ static int l2cap_sock_bind(struct socket *sock, struct sockaddr *addr, int alen)
      }

      if (la.l2_cid)
-             err = l2cap_add_scid(chan, la.l2_cid);
+             err = l2cap_add_scid(chan, __le16_to_cpu(la.l2_cid));
      else
              err = l2cap_add_psm(chan, &la.l2_bdaddr, la.l2_psm);

@@ -123,7 +123,8 @@ static int l2cap_sock_connect(struct socket *sock, struct sockaddr *addr, int al
      if (la.l2_cid && la.l2_psm)
              return -EINVAL;

-     err = l2cap_chan_connect(chan, la.l2_psm, la.l2_cid, &la.l2_bdaddr);
+     err = l2cap_chan_connect(chan, la.l2_psm, __le16_to_cpu(la.l2_cid),
+                             &la.l2_bdaddr);
I live this to Marcel to decide should we reindent our code otherwise this
one looks odd.

Best regards
Andrei Emeltchenko





  

    
Re: Resend: [PATCH] Bluetooth: Fix Endian Bug.

    

      From: Andrei Emeltchenko <hidden>

      Date: 2012-03-02 12:33:24 
    

  

  
Hi Santosh,

On Thu, Mar 01, 2012 at 07:34:58PM +0530, santosh prasad nayak wrote:
Andrei,

I could not get you.

Do you want me to resend the patch with subject,
  "[PATCH] Bluetooth: Fix network to host endian conversion for L2CAP
chan id."  ?
No, the main concern was your commit message which is changelog and should
come after "---" as it is shown in the example below.

quoted
On Thu, Mar 01, 2012 at 04:29:21PM +0530, santosh nayak wrote:
quoted
From: Santosh Nayak <redacted>

Fix for endian bug.

Fix for null dereferenced removed as it is already
submitted by Andrei.

Signed-off-by: Santosh Nayak <redacted>
---
 net/bluetooth/l2cap_sock.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)
We prefer following commit log (this is the example)

<------8<----------------------------------------------------------
|  From: Santosh Nayak [off-list ref]
|
|  Fix network to host endian conversion for L2CAP chan id.
|
|  Signed-off-by: Santosh Nayak [off-list ref]
|
|  ---
|          * v2 Fix for null dereferenced removed as it is already
|          submitted by Andrei.
|
|    net/bluetooth/l2cap_sock.c |    5 +++--
|    1 files changed, 3 insertions(+), 2 deletions(-)
|
<------8<----------------------------------------------------------
Best regards 
Andrei Emeltchenko 




    
  

  
    

      

        Keyboard shortcuts
      

      

        
          
hback out one level

          
jnext message in thread

          
kprevious message in thread

          
ldrill in

          
Escclose help / fold thread tree

          
?toggle this help