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=HEADER_FROM_DIFFERENT_DOMAINS, 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 9A156C7618B for ; Tue, 23 Jul 2019 13:53:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 785E221738 for ; Tue, 23 Jul 2019 13:53:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731608AbfGWNxM (ORCPT ); Tue, 23 Jul 2019 09:53:12 -0400 Received: from mx2.suse.de ([195.135.220.15]:40896 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1725907AbfGWNxM (ORCPT ); Tue, 23 Jul 2019 09:53:12 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 66646AEB8; Tue, 23 Jul 2019 13:53:11 +0000 (UTC) From: Oliver Neukum To: davem@davemloft.net, netdev@vger.kernel.org Cc: Oliver Neukum Subject: [PATCHv2] libertas: add terminating entry to fw_table Date: Tue, 23 Jul 2019 15:52:56 +0200 Message-Id: <20190723135256.22475-1-oneukum@suse.com> X-Mailer: git-send-email 2.16.4 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org In case no firmware was found, the system would happily read and try to load garbage. Terminate the table properly. V2: change style issues Fixes: ce84bb69f50e6 ("libertas USB: convert to asynchronous firmware loading") Signed-off-by: Oliver Neukum Reported-by: syzbot+8a8f48672560c8ca59dd@syzkaller.appspotmail.com --- drivers/net/wireless/marvell/libertas/if_usb.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/marvell/libertas/if_usb.c b/drivers/net/wireless/marvell/libertas/if_usb.c index afac2481909b..fedafdc8b989 100644 --- a/drivers/net/wireless/marvell/libertas/if_usb.c +++ b/drivers/net/wireless/marvell/libertas/if_usb.c @@ -50,7 +50,10 @@ 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 }, + + /* terminating entry - keep at end */ + { MODEL_8388, NULL, NULL } }; static const struct usb_device_id if_usb_table[] = { -- 2.16.4