diff for duplicates of <20100422095201.GO29647@bicker> diff --git a/a/1.txt b/N1/1.txt index d0b4c4c..f996e75 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -9,7 +9,7 @@ index 99d68c3..9753b69 100644 +++ b/net/bluetooth/l2cap.c @@ -1626,7 +1626,10 @@ static int l2cap_sock_sendmsg(struct kiocb *iocb, struct socket *sock, struct ms /* Connectionless channel */ - if (sk->sk_type = SOCK_DGRAM) { + if (sk->sk_type == SOCK_DGRAM) { skb = l2cap_create_connless_pdu(sk, msg, len); - err = l2cap_do_send(sk, skb); + if (IS_ERR(skb)) diff --git a/a/content_digest b/N1/content_digest index 8634498..80730fd 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ "From\0Dan Carpenter <error27@gmail.com>\0" "Subject\0[patch] bluetooth: handle l2cap_create_connless_pdu() errors\0" - "Date\0Thu, 22 Apr 2010 09:52:01 +0000\0" + "Date\0Thu, 22 Apr 2010 11:52:01 +0200\0" "To\0Marcel Holtmann <marcel@holtmann.org>\0" "Cc\0David S. Miller <davem@davemloft.net>" Gustavo F. Padovan <gustavo@padovan.org> @@ -21,7 +21,7 @@ "+++ b/net/bluetooth/l2cap.c\n" "@@ -1626,7 +1626,10 @@ static int l2cap_sock_sendmsg(struct kiocb *iocb, struct socket *sock, struct ms\n" " \t/* Connectionless channel */\n" - " \tif (sk->sk_type = SOCK_DGRAM) {\n" + " \tif (sk->sk_type == SOCK_DGRAM) {\n" " \t\tskb = l2cap_create_connless_pdu(sk, msg, len);\n" "-\t\terr = l2cap_do_send(sk, skb);\n" "+\t\tif (IS_ERR(skb))\n" @@ -31,4 +31,4 @@ " \t\tgoto done;\n" " \t}" -489082c0a03e0434890934b5daa9628cbd30850d2d7d6305cb438f45c4e1423c +dd8f145a548d909992e8171e6f34f2a8be2dba52ec5c7dcf46a247254a9604d9
diff --git a/a/1.txt b/N2/1.txt index d0b4c4c..6e9bcaa 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -1,7 +1,7 @@ l2cap_create_connless_pdu() can sometimes return ERR_PTR(-ENOMEM) or ERR_PTR(-EFAULT). -Signed-off-by: Dan Carpenter <error27@gmail.com> +Signed-off-by: Dan Carpenter <error27-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> diff --git a/net/bluetooth/l2cap.c b/net/bluetooth/l2cap.c index 99d68c3..9753b69 100644 @@ -9,7 +9,7 @@ index 99d68c3..9753b69 100644 +++ b/net/bluetooth/l2cap.c @@ -1626,7 +1626,10 @@ static int l2cap_sock_sendmsg(struct kiocb *iocb, struct socket *sock, struct ms /* Connectionless channel */ - if (sk->sk_type = SOCK_DGRAM) { + if (sk->sk_type == SOCK_DGRAM) { skb = l2cap_create_connless_pdu(sk, msg, len); - err = l2cap_do_send(sk, skb); + if (IS_ERR(skb)) diff --git a/a/content_digest b/N2/content_digest index 8634498..4999d21 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,19 +1,19 @@ - "From\0Dan Carpenter <error27@gmail.com>\0" + "From\0Dan Carpenter <error27-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>\0" "Subject\0[patch] bluetooth: handle l2cap_create_connless_pdu() errors\0" - "Date\0Thu, 22 Apr 2010 09:52:01 +0000\0" - "To\0Marcel Holtmann <marcel@holtmann.org>\0" - "Cc\0David S. Miller <davem@davemloft.net>" - Gustavo F. Padovan <gustavo@padovan.org> - Andrei Emeltchenko <andrei.emeltchenko@nokia.com> - linux-bluetooth@vger.kernel.org - netdev@vger.kernel.org - " kernel-janitors@vger.kernel.org\0" + "Date\0Thu, 22 Apr 2010 11:52:01 +0200\0" + "To\0Marcel Holtmann <marcel-kz+m5ild9QBg9hUCZPvPmw@public.gmane.org>\0" + "Cc\0David S. Miller <davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org>" + Gustavo F. Padovan <gustavo-THi1TnShQwVAfugRpC6u6w@public.gmane.org> + Andrei Emeltchenko <andrei.emeltchenko-xNZwKgViW5gAvxtiuMwx3w@public.gmane.org> + linux-bluetooth-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + " kernel-janitors-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\0" "\00:1\0" "b\0" "l2cap_create_connless_pdu() can sometimes return ERR_PTR(-ENOMEM) or\n" "ERR_PTR(-EFAULT).\n" "\n" - "Signed-off-by: Dan Carpenter <error27@gmail.com>\n" + "Signed-off-by: Dan Carpenter <error27-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>\n" "\n" "diff --git a/net/bluetooth/l2cap.c b/net/bluetooth/l2cap.c\n" "index 99d68c3..9753b69 100644\n" @@ -21,7 +21,7 @@ "+++ b/net/bluetooth/l2cap.c\n" "@@ -1626,7 +1626,10 @@ static int l2cap_sock_sendmsg(struct kiocb *iocb, struct socket *sock, struct ms\n" " \t/* Connectionless channel */\n" - " \tif (sk->sk_type = SOCK_DGRAM) {\n" + " \tif (sk->sk_type == SOCK_DGRAM) {\n" " \t\tskb = l2cap_create_connless_pdu(sk, msg, len);\n" "-\t\terr = l2cap_do_send(sk, skb);\n" "+\t\tif (IS_ERR(skb))\n" @@ -31,4 +31,4 @@ " \t\tgoto done;\n" " \t}" -489082c0a03e0434890934b5daa9628cbd30850d2d7d6305cb438f45c4e1423c +e9c0fa11050adca7e77da598bd50f00ae10f1adb63072648a3989d5da6ebeb87
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.