From patchwork Fri Aug 10 17:22:37 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Harsha Sharma X-Patchwork-Id: 956351 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netfilter-devel-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="pkOarWB4"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 41nBlf4f34z9s5b for ; Sat, 11 Aug 2018 03:22:54 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727738AbeHJTxi (ORCPT ); Fri, 10 Aug 2018 15:53:38 -0400 Received: from mail-pg1-f195.google.com ([209.85.215.195]:37490 "EHLO mail-pg1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727404AbeHJTxi (ORCPT ); Fri, 10 Aug 2018 15:53:38 -0400 Received: by mail-pg1-f195.google.com with SMTP id n7-v6so4702292pgq.4 for ; Fri, 10 Aug 2018 10:22:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=I5gPaibvE9BChHc8H+4INTibIga74KQlAxrXvc0MHuI=; b=pkOarWB4jiaOS2bYa84wt3s+FWJXVsEOYY1mw5zAENeIBvwZ27EAq2jYX0P8C1yFF1 Rx7Hv9VzVGAfquQ9u/1MHiV+Hyc6f4BTvx7n8AQwiiecNpBVZfwIzN9wwn3Gi+XXPZfu If0fj7aB0BaqQENVH24I9wd+4+LlMT1sDjphwckY10y3zHN5gRFcSS1/RZI+xh8zdprl XckBvQMewXvSzUXxnczbCVKI1arqg28Dg0YxTg+TiZqC7PbDC5WHIUWR/M4JTjDl2Qyf 6QT3LG190bMF1ttHt7JMXlNsV71v6j94zLCGUiH94cunAGXEsDqyFr9muRdpfWtSYmej EtTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=I5gPaibvE9BChHc8H+4INTibIga74KQlAxrXvc0MHuI=; b=QtOs16ry5ZD6dLDGU0b+Gf2bZIKIX9EtNQcOHWGyoa10sBgGHdmmvXjy1hqjZ5YSXJ 5ohjh0iw8H23GuZqd0jDMqo7v9xkmzQvQzSg9kClI4V68xL46q8s1eKTrcQb3jva8AQM nM09lHHy2GJbGbrh7KR6386p4YqJNAw9enpztaAJyAlGKb/esCTCd7BSWK5sgMekvkwe 9/WRC0Ltsxhvy8R9EgzHewf6+N6Oiv+qPVbSRzaqfp/ReX9U0hl5j0F+dBUMATwemwpA hRDP+6utMcOF9W72lDJ9gBOFRaHLGFairdYRXSWcJZXdycyo9QJsf+OR6o7UdyJY5e1a 6+dQ== X-Gm-Message-State: AOUpUlG9iikZ3AiDbtiSqg9SY5fTh9CkL8Jfcp41HDEDNUAZwN2EFNfl xMuSChkux3/UkC8ZTUus9Ag= X-Google-Smtp-Source: AA+uWPzth0cVLhwEYw9fsZpprn9hHbKlBpnasknq/tyoAyxYUn6CkrjLA3vQimP3QXs6UFV9oT+0bA== X-Received: by 2002:a63:2043:: with SMTP id r3-v6mr7462772pgm.105.1533921772433; Fri, 10 Aug 2018 10:22:52 -0700 (PDT) Received: from XDDDDD.iitr.ernet.in ([103.37.201.27]) by smtp.gmail.com with ESMTPSA id 1-v6sm26572938pfk.134.2018.08.10.10.22.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 10 Aug 2018 10:22:51 -0700 (PDT) From: Harsha Sharma To: harshasharmaiitr@gmail.com, pablo@netfilter.org Cc: netfilter-devel@vger.kernel.org Subject: [PATCH nf-next] netfilter: nft_ct: make l3 protocol field optional for timeout object Date: Fri, 10 Aug 2018 22:52:37 +0530 Message-Id: <20180810172237.15119-1-harshasharmaiitr@gmail.com> X-Mailer: git-send-email 2.14.1 Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org If l3 protocol value is not specified for ct timeout object then use the value from nft_ctx protocol family. Signed-off-by: Harsha Sharma --- net/netfilter/nft_ct.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/net/netfilter/nft_ct.c b/net/netfilter/nft_ct.c index 4855d4ce1c8f..1c7ac6bde0b5 100644 --- a/net/netfilter/nft_ct.c +++ b/net/netfilter/nft_ct.c @@ -832,12 +832,12 @@ static int nft_ct_timeout_obj_init(const struct nft_ctx *ctx, __u8 l4num; int ret; - if (!tb[NFTA_CT_TIMEOUT_L3PROTO] || - !tb[NFTA_CT_TIMEOUT_L4PROTO] || - !tb[NFTA_CT_TIMEOUT_DATA]) + if (!tb[NFTA_CT_TIMEOUT_L4PROTO] || !tb[NFTA_CT_TIMEOUT_DATA]) return -EINVAL; - l3num = ntohs(nla_get_be16(tb[NFTA_CT_TIMEOUT_L3PROTO])); + if (tb[NFTA_CT_TIMEOUT_L3PROTO]) + l3num = ntohs(nla_get_be16(tb[NFTA_CT_TIMEOUT_L3PROTO])); + l4num = nla_get_u8(tb[NFTA_CT_TIMEOUT_L4PROTO]); priv->l4proto = l4num;