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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,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 54104C10F14 for ; Thu, 3 Oct 2019 16:57:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 288E620673 for ; Thu, 3 Oct 2019 16:57:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1570121843; bh=GSS11zVS5sAZCAm/t7b3x4fHnf3ZmTKbpHI1jMi/XZQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=APBAB6e/NIxZc7OQFj0l5Nk9z2klGx18e/h2oPfuQ8/l20+QCXi8DJhEPuaI9f3Ql DeKBSL+GerUDRXWC7EYK/NBhwjsg+nKgplBshkfEBx04rfU6gKOEGDeyM88mu/Qr34 h/GnFXQtNITcqwiLWeo8EJfISnD6nsx2WKnDvYVU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2405110AbfJCQtz (ORCPT ); Thu, 3 Oct 2019 12:49:55 -0400 Received: from mail.kernel.org ([198.145.29.99]:36704 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2405872AbfJCQty (ORCPT ); Thu, 3 Oct 2019 12:49:54 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 A5D9D20865; Thu, 3 Oct 2019 16:49:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1570121394; bh=GSS11zVS5sAZCAm/t7b3x4fHnf3ZmTKbpHI1jMi/XZQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pLdDp1mZROeM0Xx8kfLfk9O/a9DgSUfLUC5dMkFbZWDvCjvG1C1r7o0xvIMwuenyE IAewjQWn2rawcYfdm9qXKlV7PDPNOHfi2kMNlJlIuzEtfpOkWwb/JTKqz5BkQBZUKX 6JbcTgS1LSFQnBs11C0Pf5j/XbHpTsEy+fNn/Jwc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, syzbot+74c65761783d66a9c97c@syzkaller.appspotmail.com, Oliver Neukum , Kalle Valo , Sasha Levin Subject: [PATCH 5.3 227/344] zd1211rw: remove false assertion from zd_mac_clear() Date: Thu, 3 Oct 2019 17:53:12 +0200 Message-Id: <20191003154602.764454005@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191003154540.062170222@linuxfoundation.org> References: <20191003154540.062170222@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Oliver Neukum [ Upstream commit 7a2eb7367fdea72e448d1a847aa857f6caf8ea2f ] The function is called before the lock which is asserted was ever used. Just remove it. Reported-by: syzbot+74c65761783d66a9c97c@syzkaller.appspotmail.com Signed-off-by: Oliver Neukum Signed-off-by: Kalle Valo Signed-off-by: Sasha Levin --- drivers/net/wireless/zydas/zd1211rw/zd_mac.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/net/wireless/zydas/zd1211rw/zd_mac.c b/drivers/net/wireless/zydas/zd1211rw/zd_mac.c index da7e63fca9f57..a9999d10ae81f 100644 --- a/drivers/net/wireless/zydas/zd1211rw/zd_mac.c +++ b/drivers/net/wireless/zydas/zd1211rw/zd_mac.c @@ -223,7 +223,6 @@ void zd_mac_clear(struct zd_mac *mac) { flush_workqueue(zd_workqueue); zd_chip_clear(&mac->chip); - lockdep_assert_held(&mac->lock); ZD_MEMCLEAR(mac, sizeof(struct zd_mac)); } -- 2.20.1