diff for duplicates of <20120309150839.GG4497@localhost> diff --git a/a/1.txt b/N1/1.txt index 02111a3..8cd6780 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,7 +1,7 @@ On Fri, Mar 09, 2012 at 04:02:21PM +0100, David Herrmann wrote: -> On Fri, Mar 9, 2012 at 3:40 PM, Johan Hovold <jhovold@gmail.com> wrote: +> On Fri, Mar 9, 2012 at 3:40 PM, Johan Hovold <jhovold-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> wrote: > > On Fri, Mar 09, 2012 at 02:52:00PM +0100, David Herrmann wrote: -> >> On Fri, Mar 9, 2012 at 2:04 PM, Johan Hovold <jhovold@gmail.com> wrote: +> >> On Fri, Mar 9, 2012 at 2:04 PM, Johan Hovold <jhovold-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> wrote: > >> > On Thu, Mar 08, 2012 at 09:45:22AM -0800, Marcel Holtmann wrote: > >> >> > > > Do not close protocol driver until device has been unregistered. > >> >> > > > diff --git a/a/content_digest b/N1/content_digest index dcf2044..0d2bf99 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -7,23 +7,24 @@ "ref\0CANq1E4RjnCdUfZuKawHs2te9wX30H-boC5tUPFarBCVbtn2n5Q@mail.gmail.com\0" "ref\020120309144013.GE4497@localhost\0" "ref\0CANq1E4TcUKKXetitjWJZgP9550gnB43rncnAcwwdz_6HpZf_Ug@mail.gmail.com\0" - "From\0Johan Hovold <jhovold@gmail.com>\0" + "ref\0CANq1E4TcUKKXetitjWJZgP9550gnB43rncnAcwwdz_6HpZf_Ug-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org\0" + "From\0Johan Hovold <jhovold-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>\0" "Subject\0Re: [PATCH 1/2] bluetooth: hci_ldisc: fix NULL-pointer dereference on tty_close\0" "Date\0Fri, 9 Mar 2012 16:08:39 +0100\0" - "To\0David Herrmann <dh.herrmann@googlemail.com>\0" - "Cc\0Marcel Holtmann <marcel@holtmann.org>" - Gustavo F. Padovan <padovan@profusion.mobi> - David S. Miller <davem@davemloft.net> - linux-bluetooth@vger.kernel.org - linux-kernel@vger.kernel.org - netdev@vger.kernel.org - " stable <stable@vger.kernel.org>\0" + "To\0David Herrmann <dh.herrmann-gM/Ye1E23mwN+BqQ9rBEUg@public.gmane.org>\0" + "Cc\0Marcel Holtmann <marcel-kz+m5ild9QBg9hUCZPvPmw@public.gmane.org>" + Gustavo F. Padovan <padovan-Y3ZbgMPKUGA34EUeqzHoZw@public.gmane.org> + David S. Miller <davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org> + linux-bluetooth-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + " stable <stable-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>\0" "\00:1\0" "b\0" "On Fri, Mar 09, 2012 at 04:02:21PM +0100, David Herrmann wrote:\n" - "> On Fri, Mar 9, 2012 at 3:40 PM, Johan Hovold <jhovold@gmail.com> wrote:\n" + "> On Fri, Mar 9, 2012 at 3:40 PM, Johan Hovold <jhovold-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> wrote:\n" "> > On Fri, Mar 09, 2012 at 02:52:00PM +0100, David Herrmann wrote:\n" - "> >> On Fri, Mar 9, 2012 at 2:04 PM, Johan Hovold <jhovold@gmail.com> wrote:\n" + "> >> On Fri, Mar 9, 2012 at 2:04 PM, Johan Hovold <jhovold-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> wrote:\n" "> >> > On Thu, Mar 08, 2012 at 09:45:22AM -0800, Marcel Holtmann wrote:\n" "> >> >> > > > Do not close protocol driver until device has been unregistered.\n" "> >> >> > > >\n" @@ -132,4 +133,4 @@ "Thanks,\n" Johan -7abada5484e5b68faeb50379afe9feaf4996b38f23cd06d5a503981f9a8457b3 +480e903639d3512a943b4b958350b82f4422fbbdcb30a1acabfd60cabf16fb8a
diff --git a/a/1.txt b/N2/1.txt index 02111a3..9ab5380 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -46,20 +46,20 @@ On Fri, Mar 09, 2012 at 04:02:21PM +0100, David Herrmann wrote: > >> > --- a/drivers/bluetooth/hci_ldisc.c > >> > +++ b/drivers/bluetooth/hci_ldisc.c > >> > @@ -237,7 +237,6 @@ static void hci_uart_destruct(struct hci_dev *hdev) -> >> > return; +> >> > � � � � � � � �return; > >> > -> >> > BT_DBG("%s", hdev->name); -> >> > - kfree(hdev->driver_data); -> >> > } +> >> > � � � �BT_DBG("%s", hdev->name); +> >> > - � � � kfree(hdev->driver_data); +> >> > �} > >> > -> >> > /* ------ LDISC part ------ */ +> >> > �/* ------ LDISC part ------ */ > >> > @@ -316,6 +315,7 @@ static void hci_uart_tty_close(struct tty_struct *tty) -> >> > hci_free_dev(hdev); -> >> > } -> >> > } -> >> > + kfree(hu); -> >> > } -> >> > } +> >> > � � � � � � � � � � � � � � � �hci_free_dev(hdev); +> >> > � � � � � � � � � � � �} +> >> > � � � � � � � �} +> >> > + � � � � � � � kfree(hu); +> >> > � � � �} +> >> > �} > >> > >> The "destruct"-callback was broken in many ways but working around it > >> without removing it seems wrong. @@ -96,7 +96,7 @@ Yes, I would definitely mention those patches. > >> > >> if (test_and_clear_bit(...)) { > >> } else { -> >> + kfree(...); +> >> + � kfree(...); > >> } > > > > You really don't want to free the hci_uart in it's own close method... diff --git a/a/content_digest b/N2/content_digest index dcf2044..37c7631 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -68,20 +68,20 @@ "> >> > --- a/drivers/bluetooth/hci_ldisc.c\n" "> >> > +++ b/drivers/bluetooth/hci_ldisc.c\n" "> >> > @@ -237,7 +237,6 @@ static void hci_uart_destruct(struct hci_dev *hdev)\n" - "> >> > \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240return;\n" + "> >> > \303\257\302\277\302\275 \303\257\302\277\302\275 \303\257\302\277\302\275 \303\257\302\277\302\275 \303\257\302\277\302\275 \303\257\302\277\302\275 \303\257\302\277\302\275 \303\257\302\277\302\275return;\n" "> >> >\n" - "> >> > \302\240 \302\240 \302\240 \302\240BT_DBG(\"%s\", hdev->name);\n" - "> >> > - \302\240 \302\240 \302\240 kfree(hdev->driver_data);\n" - "> >> > \302\240}\n" + "> >> > \303\257\302\277\302\275 \303\257\302\277\302\275 \303\257\302\277\302\275 \303\257\302\277\302\275BT_DBG(\"%s\", hdev->name);\n" + "> >> > - \303\257\302\277\302\275 \303\257\302\277\302\275 \303\257\302\277\302\275 kfree(hdev->driver_data);\n" + "> >> > \303\257\302\277\302\275}\n" "> >> >\n" - "> >> > \302\240/* ------ LDISC part ------ */\n" + "> >> > \303\257\302\277\302\275/* ------ LDISC part ------ */\n" "> >> > @@ -316,6 +315,7 @@ static void hci_uart_tty_close(struct tty_struct *tty)\n" - "> >> > \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240hci_free_dev(hdev);\n" - "> >> > \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240}\n" - "> >> > \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240}\n" - "> >> > + \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 kfree(hu);\n" - "> >> > \302\240 \302\240 \302\240 \302\240}\n" - "> >> > \302\240}\n" + "> >> > \303\257\302\277\302\275 \303\257\302\277\302\275 \303\257\302\277\302\275 \303\257\302\277\302\275 \303\257\302\277\302\275 \303\257\302\277\302\275 \303\257\302\277\302\275 \303\257\302\277\302\275 \303\257\302\277\302\275 \303\257\302\277\302\275 \303\257\302\277\302\275 \303\257\302\277\302\275 \303\257\302\277\302\275 \303\257\302\277\302\275 \303\257\302\277\302\275 \303\257\302\277\302\275hci_free_dev(hdev);\n" + "> >> > \303\257\302\277\302\275 \303\257\302\277\302\275 \303\257\302\277\302\275 \303\257\302\277\302\275 \303\257\302\277\302\275 \303\257\302\277\302\275 \303\257\302\277\302\275 \303\257\302\277\302\275 \303\257\302\277\302\275 \303\257\302\277\302\275 \303\257\302\277\302\275 \303\257\302\277\302\275}\n" + "> >> > \303\257\302\277\302\275 \303\257\302\277\302\275 \303\257\302\277\302\275 \303\257\302\277\302\275 \303\257\302\277\302\275 \303\257\302\277\302\275 \303\257\302\277\302\275 \303\257\302\277\302\275}\n" + "> >> > + \303\257\302\277\302\275 \303\257\302\277\302\275 \303\257\302\277\302\275 \303\257\302\277\302\275 \303\257\302\277\302\275 \303\257\302\277\302\275 \303\257\302\277\302\275 kfree(hu);\n" + "> >> > \303\257\302\277\302\275 \303\257\302\277\302\275 \303\257\302\277\302\275 \303\257\302\277\302\275}\n" + "> >> > \303\257\302\277\302\275}\n" "> >>\n" "> >> The \"destruct\"-callback was broken in many ways but working around it\n" "> >> without removing it seems wrong.\n" @@ -118,7 +118,7 @@ "> >>\n" "> >> if (test_and_clear_bit(...)) {\n" "> >> } else {\n" - "> >> + \302\240 kfree(...);\n" + "> >> + \303\257\302\277\302\275 kfree(...);\n" "> >> }\n" "> >\n" "> > You really don't want to free the hci_uart in it's own close method...\n" @@ -132,4 +132,4 @@ "Thanks,\n" Johan -7abada5484e5b68faeb50379afe9feaf4996b38f23cd06d5a503981f9a8457b3 +cddddb92d8eae35592e3d425ac515642b003fe6d6102bdbf60f220c5b1b660e9
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.