From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 64C38CA9ED4 for ; Mon, 4 Nov 2019 22:03:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 30F1520650 for ; Mon, 4 Nov 2019 22:03:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572904995; bh=xxDDr/zM+xU3ky0bYYZKmJYCAwy45XockdaIYNTjliU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=uGpyDU8jg8oQOO1lO+5eGFBxqjd5IsgPrZ+6uUn0zwiNOALXSkxGSBsE/S92ShXVW 7XWY2YAbsPdO4a7wWpiN7CagqS8Hfy1WdmQ5BmY4L7k3J3KCy1v8Tm4jPnantpOh9X 0SEqn0uOkAL4FiKBXyAXO+EkFMuwLgorRx64OIVs= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389472AbfKDWDO (ORCPT ); Mon, 4 Nov 2019 17:03:14 -0500 Received: from mail.kernel.org ([198.145.29.99]:33444 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388757AbfKDWDJ (ORCPT ); Mon, 4 Nov 2019 17:03:09 -0500 Received: from localhost (6.204-14-84.ripe.coltfrance.com [84.14.204.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 1E62A205C9; Mon, 4 Nov 2019 22:03:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572904988; bh=xxDDr/zM+xU3ky0bYYZKmJYCAwy45XockdaIYNTjliU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=j7HNJ3YMhdQWJOO1Uupi+Jm3xZYHNnhCGFCN0EftzQt6ArLx/10bKgQp9QKu+xcIV /mSkNtK5mNPDRgxMhCa3T20mNnEBa5THntppdtFhRElf+B1Qw0Ru75jKQbE7elmGP1 K2gaPNRBHVf4OkTkrtW4nuP+2qvMXQCFjb2NJL+g= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, syzbot+cb035c75c03dbe34b796@syzkaller.appspotmail.com, Johan Hovold , Jakub Kicinski Subject: [PATCH 4.19 141/149] NFC: pn533: fix use-after-free and memleaks Date: Mon, 4 Nov 2019 22:45:34 +0100 Message-Id: <20191104212146.601835991@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191104212126.090054740@linuxfoundation.org> References: <20191104212126.090054740@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Johan Hovold commit 6af3aa57a0984e061f61308fe181a9a12359fecc upstream. The driver would fail to deregister and its class device and free related resources on late probe errors. Reported-by: syzbot+cb035c75c03dbe34b796@syzkaller.appspotmail.com Fixes: 32ecc75ded72 ("NFC: pn533: change order operations in dev registation") Signed-off-by: Johan Hovold Signed-off-by: Jakub Kicinski Signed-off-by: Greg Kroah-Hartman --- drivers/nfc/pn533/usb.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) --- a/drivers/nfc/pn533/usb.c +++ b/drivers/nfc/pn533/usb.c @@ -559,18 +559,25 @@ static int pn533_usb_probe(struct usb_in rc = pn533_finalize_setup(priv); if (rc) - goto error; + goto err_deregister; usb_set_intfdata(interface, phy); return 0; +err_deregister: + pn533_unregister_device(phy->priv); error: + usb_kill_urb(phy->in_urb); + usb_kill_urb(phy->out_urb); + usb_kill_urb(phy->ack_urb); + usb_free_urb(phy->in_urb); usb_free_urb(phy->out_urb); usb_free_urb(phy->ack_urb); usb_put_dev(phy->udev); kfree(in_buf); + kfree(phy->ack_buffer); return rc; }