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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,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 E10B1C43332 for ; Wed, 18 Mar 2020 21:08:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AC6D820409 for ; Wed, 18 Mar 2020 21:08:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1584565708; bh=UCWdsj3dxu3ykdmpF7UQVIcwIPD6/HP+yyzXbq2B5Sk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=PpkV1PGkvyMj23GhBqeuX7nLQan6ejsSzLwX3D0M1zUMwuSLBvY0jMtO84yZsuR32 ptYaGWYoJMQIKPYKCQf5NN14s7EGcT059IvpD8s3MJKVwQFzjmEMYwKqdjZC3cJiuO spKCZemFwTqPENGZhorYlyRijlGBdx60wWrRJXDA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727527AbgCRUyD (ORCPT ); Wed, 18 Mar 2020 16:54:03 -0400 Received: from mail.kernel.org ([198.145.29.99]:53306 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727499AbgCRUyC (ORCPT ); Wed, 18 Mar 2020 16:54:02 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 9656B208FE; Wed, 18 Mar 2020 20:54:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1584564841; bh=UCWdsj3dxu3ykdmpF7UQVIcwIPD6/HP+yyzXbq2B5Sk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SbXqQ62nj7ChcF5QATZw/Ws9HIanK2XeWNEyTOXIyI9SyiDDKhWHFqG0t5syY5enZ IkjcQG5hxe89BwfvJsfV9ZVq5BheNuy9tsbEqehqlzmuE2hUyLFrPpzS+LOJrzhODZ gaFHUfIMZFVFAOVWWIW9tV5sNt3YVxlnqnG9hQo0= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Jakub Kicinski , Pablo Neira Ayuso , Sasha Levin , netfilter-devel@vger.kernel.org, coreteam@netfilter.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 5.4 20/73] netfilter: cthelper: add missing attribute validation for cthelper Date: Wed, 18 Mar 2020 16:52:44 -0400 Message-Id: <20200318205337.16279-20-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200318205337.16279-1-sashal@kernel.org> References: <20200318205337.16279-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jakub Kicinski [ Upstream commit c049b3450072b8e3998053490e025839fecfef31 ] Add missing attribute validation for cthelper to the netlink policy. Fixes: 12f7a505331e ("netfilter: add user-space connection tracking helper infrastructure") Signed-off-by: Jakub Kicinski Signed-off-by: Pablo Neira Ayuso Signed-off-by: Sasha Levin --- net/netfilter/nfnetlink_cthelper.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/net/netfilter/nfnetlink_cthelper.c b/net/netfilter/nfnetlink_cthelper.c index 7525063c25f5f..60838d5fb8e06 100644 --- a/net/netfilter/nfnetlink_cthelper.c +++ b/net/netfilter/nfnetlink_cthelper.c @@ -742,6 +742,8 @@ static const struct nla_policy nfnl_cthelper_policy[NFCTH_MAX+1] = { [NFCTH_NAME] = { .type = NLA_NUL_STRING, .len = NF_CT_HELPER_NAME_LEN-1 }, [NFCTH_QUEUE_NUM] = { .type = NLA_U32, }, + [NFCTH_PRIV_DATA_LEN] = { .type = NLA_U32, }, + [NFCTH_STATUS] = { .type = NLA_U32, }, }; static const struct nfnl_callback nfnl_cthelper_cb[NFNL_MSG_CTHELPER_MAX] = { -- 2.20.1