From patchwork Sun Feb 10 21:49:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lorenzo Bianconi X-Patchwork-Id: 10804921 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 5DC8F922 for ; Sun, 10 Feb 2019 21:49:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4E66429934 for ; Sun, 10 Feb 2019 21:49:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 428672994A; Sun, 10 Feb 2019 21:49:45 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A506629934 for ; Sun, 10 Feb 2019 21:49:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726530AbfBJVtn (ORCPT ); Sun, 10 Feb 2019 16:49:43 -0500 Received: from mail-wm1-f65.google.com ([209.85.128.65]:35190 "EHLO mail-wm1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726008AbfBJVtn (ORCPT ); Sun, 10 Feb 2019 16:49:43 -0500 Received: by mail-wm1-f65.google.com with SMTP id t200so13309879wmt.0 for ; Sun, 10 Feb 2019 13:49:42 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=EM4pdGLHRU/lVQyT45gCPHPza74VRDDVhq/VZ5wVjfA=; b=sBcuSmczIAwkk9PP65hO9rVMiTCs32Gh91xWHAvsHN6gGeESjl8DjOKISQ/yANw7g/ Klffku69bF/4OgoJc9MBZOPKfOs9rXQrC+LhDfuzL+5VtsY5oOijVToo5vmfB1/EHDuh KlqffsY4NfqQgsTQ74rK4hTresZPZTrge2NW+gEmblSl9Ti5o/qFk6Ce7PsaeHJVNsq9 gzyh4tZXPd/Cfz56MIAUQipKI0zfHOsO53eo3Mf6QNtlqzMUipWJWNCvBlEOIUq/DsgQ f6i3O2AC+yQbd/cxSeMoN2rj5VGiAz81fJPFYgeQFANT7ZwKGOL5mR6Ox4cIL7Ot2AC2 yc5A== X-Gm-Message-State: AHQUAubqxHNa05wsqlzfdqPD+4DR+ni8IiOSmPd4/S4Rwurojzgv3cfM 8LBnpBd8Qp6CsiD4p569wjQAHzFyjE0= X-Google-Smtp-Source: AHgI3Ia7FYO202aKduHx1et9huBQ3vTw1GaG6t376elu30ET7yf42pPSZXE6SLDefmT0TfV2k2t1Zw== X-Received: by 2002:a1c:7016:: with SMTP id l22mr7366843wmc.70.1549835381452; Sun, 10 Feb 2019 13:49:41 -0800 (PST) Received: from lore-desk.lan ([151.66.10.5]) by smtp.gmail.com with ESMTPSA id q14sm5436323wrw.39.2019.02.10.13.49.40 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 10 Feb 2019 13:49:40 -0800 (PST) From: Lorenzo Bianconi To: linux-wireless@vger.kernel.org Cc: nbd@nbd.name, sgruszka@redhat.com, stefan.wahren@i2se.com Subject: [PATCH wireless-drivers 1/3] mt76: usb: fix possible NULL pointer dereference in mt76u_mcu_deinit Date: Sun, 10 Feb 2019 22:49:13 +0100 Message-Id: <54c995e58ca2bdc7ad1cb79926999e0155bb0e16.1549832428.git.lorenzo.bianconi@redhat.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: References: MIME-Version: 1.0 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Fix possible NULL pointer dereference in mt76u_mcu_deinit routine that can occur if initialization path fails before calling mt76u_mcu_init_rx Fixes: ee676cd5017c ("mt76: add driver code for MT76x2u based devices") Signed-off-by: Lorenzo Bianconi --- drivers/net/wireless/mediatek/mt76/usb_mcu.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/net/wireless/mediatek/mt76/usb_mcu.c b/drivers/net/wireless/mediatek/mt76/usb_mcu.c index 036be4163e69..9527e1216f3d 100644 --- a/drivers/net/wireless/mediatek/mt76/usb_mcu.c +++ b/drivers/net/wireless/mediatek/mt76/usb_mcu.c @@ -48,9 +48,11 @@ EXPORT_SYMBOL_GPL(mt76u_mcu_init_rx); void mt76u_mcu_deinit(struct mt76_dev *dev) { - struct mt76_usb *usb = &dev->usb; + struct mt76u_buf *buf = &dev->usb.mcu.res; - usb_kill_urb(usb->mcu.res.urb); - mt76u_buf_free(&usb->mcu.res); + if (buf->urb) { + usb_kill_urb(buf->urb); + mt76u_buf_free(buf); + } } EXPORT_SYMBOL_GPL(mt76u_mcu_deinit);