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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 F2F02CA9EB9 for ; Sat, 26 Oct 2019 13:17:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BBDCA21D7F for ; Sat, 26 Oct 2019 13:17:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572095828; bh=YMIA8rjAV5K28qn2+cRhD8XtwVSArNt+QfSzG8Gnd1I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=lZEY+IBXmIoTyB3yDHxC9rW3Wy4K5EMcFHLVN2juSdzcxJVG20DnZVHR8GWsz8S3y G1a538YB7kwRiJUqvlnF43wcfAGSU8E96GiEyWmAb+msyOFvHYJybxYJ8/OxKFMB5e xgZ+JHauBfv+SsaJtnJy7vzhVEP8cUdJ+NGLem+U= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727164AbfJZNRH (ORCPT ); Sat, 26 Oct 2019 09:17:07 -0400 Received: from mail.kernel.org ([198.145.29.99]:38624 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727108AbfJZNRC (ORCPT ); Sat, 26 Oct 2019 09:17:02 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 8FA6721655; Sat, 26 Oct 2019 13:17:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572095821; bh=YMIA8rjAV5K28qn2+cRhD8XtwVSArNt+QfSzG8Gnd1I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iljvVMjZGcCFsGpOaf953Vqw0fPqijwAOyJZF4CBMKV9rGyKnkOFdInrMMUoN/8Fa acCfYd5sEYpfnTRwqBhGR1mgyBGo2PfHhsKtJRjPQz/0sWL0O4YH3hKbd1gVipXyPb NefCQBFxJG7xX9N5O9B+2H7VFXxVE2cLlVcRssSU= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Johan Hovold , syzbot+cb035c75c03dbe34b796@syzkaller.appspotmail.com, Jakub Kicinski , Sasha Levin , netdev@vger.kernel.org Subject: [PATCH AUTOSEL 5.3 33/99] NFC: pn533: fix use-after-free and memleaks Date: Sat, 26 Oct 2019 09:14:54 -0400 Message-Id: <20191026131600.2507-33-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191026131600.2507-1-sashal@kernel.org> References: <20191026131600.2507-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore 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 [ Upstream commit 6af3aa57a0984e061f61308fe181a9a12359fecc ] 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: Sasha Levin --- drivers/nfc/pn533/usb.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/drivers/nfc/pn533/usb.c b/drivers/nfc/pn533/usb.c index c5289eaf17eef..e897e4d768ef7 100644 --- a/drivers/nfc/pn533/usb.c +++ b/drivers/nfc/pn533/usb.c @@ -547,18 +547,25 @@ static int pn533_usb_probe(struct usb_interface *interface, 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; } -- 2.20.1