3.6-stable review patch. If anyone has any objections, please let me know.
------------------ From: Johan Hovold <[email protected]> Fix two memory leaks involving dbgbuf that were introduced in port-probe error paths when backporting the following port-data fixes from v3.7 (which doesn't have dbgbuf): 0978c94 USB: iuu_phoenix: fix sysfs-attribute creation 5363655 USB: iuu_phoenix: fix port-data memory leak Reported-by: Fengguang Wu <[email protected]> Signed-off-by: Johan Hovold <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]> --- drivers/usb/serial/iuu_phoenix.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/drivers/usb/serial/iuu_phoenix.c +++ b/drivers/usb/serial/iuu_phoenix.c @@ -105,7 +105,7 @@ static int iuu_port_probe(struct usb_ser } priv->dbgbuf = kzalloc(256, GFP_KERNEL); - if (!priv->writebuf) { + if (!priv->dbgbuf) { kfree(priv->writebuf); kfree(priv->buf); kfree(priv); @@ -120,6 +120,7 @@ static int iuu_port_probe(struct usb_ser ret = iuu_create_sysfs_attrs(port); if (ret) { + kfree(priv->dbgbuf); kfree(priv->writebuf); kfree(priv->buf); kfree(priv); -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
