From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752100AbcHHBff (ORCPT ); Sun, 7 Aug 2016 21:35:35 -0400 Received: from mail-wm0-f67.google.com ([74.125.82.67]:35956 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751677AbcHHBfe (ORCPT ); Sun, 7 Aug 2016 21:35:34 -0400 From: Alexey Klimov To: linux-usb@vger.kernel.org Cc: johan@kernel.org, stern@rowland.harvard.edu, gregkh@linuxfoundation.org, klimov.linux@gmail.com, linux-kernel@vger.kernel.org Subject: [PATCH] USB: serial: fix memleak on error path in usb-serial Date: Mon, 8 Aug 2016 02:34:46 +0100 Message-Id: <1470620086-22677-1-git-send-email-klimov.linux@gmail.com> X-Mailer: git-send-email 2.5.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org udriver struct allocated by kzalloc() will not be freed if usb_register() and next calls fail. This patch fixes this by adding one more step with kfree(udriver) in error path. Cc: Alan Stern Signed-off-by: Alexey Klimov --- drivers/usb/serial/usb-serial.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c index b1b9bac..d213cf4 100644 --- a/drivers/usb/serial/usb-serial.c +++ b/drivers/usb/serial/usb-serial.c @@ -1433,7 +1433,7 @@ int usb_serial_register_drivers(struct usb_serial_driver *const serial_drivers[] rc = usb_register(udriver); if (rc) - return rc; + goto failed_usb_register; for (sd = serial_drivers; *sd; ++sd) { (*sd)->usb_driver = udriver; @@ -1451,6 +1451,8 @@ int usb_serial_register_drivers(struct usb_serial_driver *const serial_drivers[] while (sd-- > serial_drivers) usb_serial_deregister(*sd); usb_deregister(udriver); +failed_usb_register: + kfree(udriver); return rc; } EXPORT_SYMBOL_GPL(usb_serial_register_drivers); -- 2.5.0