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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 C5D57C43331 for ; Wed, 1 Apr 2020 16:23:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5B84221582 for ; Wed, 1 Apr 2020 16:23:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585758235; bh=3we1ElBHZOfdh+86jchh0lGPqPuLHfEXdcirgbgk7V8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Q5/d24I+F6gIhuoZDN0M1cj4BqtuKWTReb957zw2XImsWtjyMNN8j7daCy8U0zl7d DMfIxxwrC6MbvG72k6HCKUQSkmW2bMc2tR+fMwb/3UmTOoedfnjG52hGRYXBCOgK1H ZZZWPkaynTmL5dywabgFW1w02xHAUh12gdGiMLYs= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387641AbgDAQXy (ORCPT ); Wed, 1 Apr 2020 12:23:54 -0400 Received: from mail.kernel.org ([198.145.29.99]:47232 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1733291AbgDAQXt (ORCPT ); Wed, 1 Apr 2020 12:23:49 -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 7EC2D21556; Wed, 1 Apr 2020 16:23:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585758229; bh=3we1ElBHZOfdh+86jchh0lGPqPuLHfEXdcirgbgk7V8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hlR1EvAG+1sLsQdVpxObIMHygd8KHt74vhpDBFW709Rw0EUxg1MmraYUklO888JbV fb9Tx02zaOGmQs+AEGkgidjQUsAGBH65/PhMI/x0P/IWbytsDWvv14TwwuFLAsl92O FpWnCPMZFMf/m712FKyd8qurWadT0nPjmh8VP7V0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, syzbot+1b4ebf4dae4e510dd219@syzkaller.appspotmail.com, Petr Machata , "David S. Miller" Subject: [PATCH 4.19 024/116] net: ip_gre: Accept IFLA_INFO_DATA-less configuration Date: Wed, 1 Apr 2020 18:16:40 +0200 Message-Id: <20200401161545.428270331@linuxfoundation.org> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200401161542.669484650@linuxfoundation.org> References: <20200401161542.669484650@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Petr Machata [ Upstream commit 32ca98feab8c9076c89c0697c5a85e46fece809d ] The fix referenced below causes a crash when an ERSPAN tunnel is created without passing IFLA_INFO_DATA. Fix by validating passed-in data in the same way as ipgre does. Fixes: e1f8f78ffe98 ("net: ip_gre: Separate ERSPAN newlink / changelink callbacks") Reported-by: syzbot+1b4ebf4dae4e510dd219@syzkaller.appspotmail.com Signed-off-by: Petr Machata Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- net/ipv4/ip_gre.c | 2 ++ 1 file changed, 2 insertions(+) --- a/net/ipv4/ip_gre.c +++ b/net/ipv4/ip_gre.c @@ -1241,6 +1241,8 @@ static int erspan_netlink_parms(struct n err = ipgre_netlink_parms(dev, data, tb, parms, fwmark); if (err) return err; + if (!data) + return 0; if (data[IFLA_GRE_ERSPAN_VER]) { t->erspan_ver = nla_get_u8(data[IFLA_GRE_ERSPAN_VER]);