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=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 5722AC32792 for ; Thu, 3 Oct 2019 16:04:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2515021A4C for ; Thu, 3 Oct 2019 16:04:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1570118656; bh=ZIaieDLicGUG3TmJV9/uGk86iXiemrKdvkHze4wayDE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=iK7HlSIIxuzu4CfwDMdA3SazgOATx5/lsopDwGLIlX1sNWpKf/vFvI7stCio6h/G5 y3FxrBoa+FEFrk6M1+gP5nOKSclAsuXEgkCN+csDkabond9NQFM/11gbap59K77m7V CjNP4K5Gvp5R1mHzPKDXR1FjwKO2EVRiMz9+APkU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732366AbfJCQEO (ORCPT ); Thu, 3 Oct 2019 12:04:14 -0400 Received: from mail.kernel.org ([198.145.29.99]:50096 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732361AbfJCQEN (ORCPT ); Thu, 3 Oct 2019 12:04:13 -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 97E9021A4C; Thu, 3 Oct 2019 16:04:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1570118653; bh=ZIaieDLicGUG3TmJV9/uGk86iXiemrKdvkHze4wayDE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CeC8VERHdksWvXeWzYeG2JQWcA2/n77g+Mw2RLi2oc4Mwu8gBfMWIowjyev1zZfFk aC2LY34sMKNHuCVpr75ACKjDEETVUtlTo09g9KfJ0uXBVPjBuhUrxLLkstVRLUpFQC ec6d8hCkEBPywlLNMmM2kKeKIgIZVpnztqwpO6uk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Kevin Easton , Kalle Valo , Sasha Levin , syzbot+98156c174c5a2cad9f8f@syzkaller.appspotmail.com Subject: [PATCH 4.9 090/129] libertas: Add missing sentinel at end of if_usb.c fw_table Date: Thu, 3 Oct 2019 17:53:33 +0200 Message-Id: <20191003154400.287463515@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191003154318.081116689@linuxfoundation.org> References: <20191003154318.081116689@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: Kevin Easton [ Upstream commit 764f3f1ecffc434096e0a2b02f1a6cc964a89df6 ] This sentinel tells the firmware loading process when to stop. Reported-and-tested-by: syzbot+98156c174c5a2cad9f8f@syzkaller.appspotmail.com Signed-off-by: Kevin Easton Signed-off-by: Kalle Valo Signed-off-by: Sasha Levin --- drivers/net/wireless/marvell/libertas/if_usb.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/marvell/libertas/if_usb.c b/drivers/net/wireless/marvell/libertas/if_usb.c index a605d569f663a..9d147b11ee516 100644 --- a/drivers/net/wireless/marvell/libertas/if_usb.c +++ b/drivers/net/wireless/marvell/libertas/if_usb.c @@ -49,7 +49,8 @@ static const struct lbs_fw_table fw_table[] = { { MODEL_8388, "libertas/usb8388_v5.bin", NULL }, { MODEL_8388, "libertas/usb8388.bin", NULL }, { MODEL_8388, "usb8388.bin", NULL }, - { MODEL_8682, "libertas/usb8682.bin", NULL } + { MODEL_8682, "libertas/usb8682.bin", NULL }, + { 0, NULL, NULL } }; static struct usb_device_id if_usb_table[] = { -- 2.20.1