From patchwork Thu Jan 2 22:08:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 234752 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, 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 B833BC3276C for ; Thu, 2 Jan 2020 22:23:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8407020863 for ; Thu, 2 Jan 2020 22:23:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1578003784; bh=VSbxciRBW1NU4N+Z4pzUXw6YKwRStrA6h3PqUi1d9kg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=V7rPaycaHl70wWSUlGetZdsv1T5HQrkI8JMO1tn3CM/Hzonks4KLCkCp9JBf7f5yw yVaysqQI/gNNAiyl0C5t/Dkcu7OszGSawadRwY9gg9tvRouKMmrqYWmwYxJkSeuLd9 AtyEsSiCtColjJU503fGppW5O1YfmGzHXPipt8xE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729189AbgABWXD (ORCPT ); Thu, 2 Jan 2020 17:23:03 -0500 Received: from mail.kernel.org ([198.145.29.99]:44200 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728893AbgABWW7 (ORCPT ); Thu, 2 Jan 2020 17:22:59 -0500 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 20623227BF; Thu, 2 Jan 2020 22:22:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1578003778; bh=VSbxciRBW1NU4N+Z4pzUXw6YKwRStrA6h3PqUi1d9kg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mFNS6H7isdL8UTfoirzHhLI/BwfZeT5J5STEnGBJ+tIoU1gAOGl65sYGMb3OednRM QKaKQpP2uyRUbADPhbRHjX/Goe/P29m/LQUunakkS93YPhMXlSAsyyM6ouMk3M07Cs oM3jFnsp0MTd7FMC0nJ/FBV7mqkN5V7hlUTFNANY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Taehee Yoo , Jakub Kicinski Subject: [PATCH 4.19 111/114] gtp: avoid zero size hashtable Date: Thu, 2 Jan 2020 23:08:03 +0100 Message-Id: <20200102220040.300302593@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200102220029.183913184@linuxfoundation.org> References: <20200102220029.183913184@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Taehee Yoo [ Upstream commit 6a902c0f31993ab02e1b6ea7085002b9c9083b6a ] GTP default hashtable size is 1024 and userspace could set specific hashtable size with IFLA_GTP_PDP_HASHSIZE. If hashtable size is set to 0 from userspace, hashtable will not work and panic will occur. Fixes: 459aa660eb1d ("gtp: add initial driver for datapath of GPRS Tunneling Protocol (GTP-U)") Signed-off-by: Taehee Yoo Signed-off-by: Jakub Kicinski Signed-off-by: Greg Kroah-Hartman --- drivers/net/gtp.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) --- a/drivers/net/gtp.c +++ b/drivers/net/gtp.c @@ -671,10 +671,13 @@ static int gtp_newlink(struct net *src_n if (err < 0) return err; - if (!data[IFLA_GTP_PDP_HASHSIZE]) + if (!data[IFLA_GTP_PDP_HASHSIZE]) { hashsize = 1024; - else + } else { hashsize = nla_get_u32(data[IFLA_GTP_PDP_HASHSIZE]); + if (!hashsize) + hashsize = 1024; + } err = gtp_hashtable_new(gtp, hashsize); if (err < 0)