MIME-Version: 1.0
In-Reply-To: <1352538822-28221-1-git-send-email-bjorn@mork.no>
References: <509D5BCD.3010901@pacbell.net>
	<1352538822-28221-1-git-send-email-bjorn@mork.no>
Date: Sat, 10 Nov 2012 14:43:03 +0100
Message-ID: <CAMgPeKWfaNGnR=EDDEii89sP0MwhoopR-iv=pHHa5vgs-UHf+A@mail.gmail.com>
Subject: Re: [PATCH usb-linus] USB: keyspan: fix typo causing GPF on open
From: Johan Hovold <jhovold@gmail.com>
To: =?ISO-8859-1?Q?Bj=F8rn_Mork?= <bjorn@mork.no>
Cc: Richard <richjunk@pacbell.net>,
        Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org,
        stable@vger.kernel.org
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8BIT
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 2211
Lines: 64

On Sat, Nov 10, 2012 at 10:13 AM, Bj?rn Mork <bjorn@mork.no> wrote:
> Commit f79b2d0f (USB: keyspan: fix NULL-pointer dereferences and
> memory leaks) had a small typo which made the driver use wrong
> offsets when mapping serial port private data.  This results in
> in a GPF when the port is opened.
>
> Reported-by: Richard <richjunk@pacbell.net>
> Cc: <stable@vger.kernel.org>
> Cc: Johan Hovold <jhovold@gmail.com>
> Signed-off-by: Bj?rn Mork <bjorn@mork.no>

Acked-by: Johan Hovold <jhovold@gmail.com>

> ---
> Hello Richard,
>
> I wonder if you are able to test and verify this?  I do not guarantee
> that there aren't other issues around, but this small typo looked like
> an obvious killer...

Good catch, Bj?rn.

Greg, this one needs to be backported to v3.6.x.

Note that the usb_get_serial_data call below was simply redundant,
so that part is really a clean up rather than part of the fix.

Thanks,
Johan

> Bj?rn
>
>  drivers/usb/serial/keyspan.c |    3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/drivers/usb/serial/keyspan.c b/drivers/usb/serial/keyspan.c
> index 7179b0c..cff8dd5 100644
> --- a/drivers/usb/serial/keyspan.c
> +++ b/drivers/usb/serial/keyspan.c
> @@ -2430,7 +2430,7 @@ static void keyspan_release(struct usb_serial *serial)
>  static int keyspan_port_probe(struct usb_serial_port *port)
>  {
>         struct usb_serial *serial = port->serial;
> -       struct keyspan_port_private *s_priv;
> +       struct keyspan_serial_private *s_priv;
>         struct keyspan_port_private *p_priv;
>         const struct keyspan_device_details *d_details;
>         struct callbacks *cback;
> @@ -2445,7 +2445,6 @@ static int keyspan_port_probe(struct usb_serial_port *port)
>         if (!p_priv)
>                 return -ENOMEM;
>
> -       s_priv = usb_get_serial_data(port->serial);
>         p_priv->device_details = d_details;
>
>         /* Setup values for the various callback routines */
> --
> 1.7.10.4
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/