From patchwork Wed Jul 11 22:52:16 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?TcOhdMOpIEVja2w=?= X-Patchwork-Id: 942729 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=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="uWVOnVxb"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 41QvVJ69LWz9s2g for ; Thu, 12 Jul 2018 08:52:56 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390701AbeGKW72 (ORCPT ); Wed, 11 Jul 2018 18:59:28 -0400 Received: from mail-wr1-f65.google.com ([209.85.221.65]:37439 "EHLO mail-wr1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387885AbeGKW72 (ORCPT ); Wed, 11 Jul 2018 18:59:28 -0400 Received: by mail-wr1-f65.google.com with SMTP id q10-v6so19722629wrd.4 for ; Wed, 11 Jul 2018 15:52:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=zkhoPZvrB26dXK+W4RMfUFw+SBHUvOeTH+pl2jrPcLI=; b=uWVOnVxb6gpbXJvuvceZ3oREdN+Sc0jivCoZIHFUVoGscUACJUA0IH36k+obPSP1o+ aknMjmoCbiyx2U8uxM1DoRQVRt5TagGlkh5ifI3/jwOkvQj+lgFpvPeJ+ysZi6T+wnEo qvOw0CjHfmaXVYYbNLZmQBvTRFnnWAlnTuB9aS8JPr7sDMGv9GHP3YXZUqOjiL3tNl1J ElCVy4YbA9KuiBSNhhtKerqCxaOOYJGZMRNVRBbwjHHLbI8T3VSEru9zsM+Wi35zctcK VrJ3zcnEUVsH+2RY5aOVCWRVSI6OoyBGRGlts40vHEzToO//L4fLY0mc641wLVmNE4IG xd7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=zkhoPZvrB26dXK+W4RMfUFw+SBHUvOeTH+pl2jrPcLI=; b=fBeyxM+iQYbQ8yyAkdSeCNq4jlKp0k2Gf7zaN6Sa3SVGs7Bj9JoDiHtHccqpruhrSr SBlKs7YK4fx+SwCtMEnGUYHPqOwM1QQgQLGPFAc+t7lNQfVeA0C9Ywnyl9jnMK5/O8bU OdsBtNMGUdKTGTHN83fdr2/Z1TnfAy3ReQBe9CZJwHTVYnUpz2CRDJrHI/JEuv2aHnU4 CfxFshU0Z5+iBxGnNNDmZISc3E+S/1VUsEq/uqijKJJpxHOOlBQ65cxeQ6CPc3GHizae FZAlTQtpr+rVKBpUJcnQLuwLsGz6g1mGJmjyJpPpZM4iTZRBfBWXPwSUOQw15o88VIab OzhQ== X-Gm-Message-State: AOUpUlFGS2IvAMA6ka+Tp6+Kqsem10ay3J3v0A31nvf40Z0zWOtkHBw/ u21wuNe191kI/7yYVY1JVUdV7ygm X-Google-Smtp-Source: AAOMgpd6xrrSoE2dlvxl4np6FPNj8NERPiPOqCIREPpaQgprF5zY+aUSkHR8je6Uc2bZNp44edKNUA== X-Received: by 2002:adf:a599:: with SMTP id g25-v6mr357553wrc.88.1531349574392; Wed, 11 Jul 2018 15:52:54 -0700 (PDT) Received: from ecklm-lapos.localdomain (ecklm-pi.sch.bme.hu. [152.66.179.182]) by smtp.gmail.com with ESMTPSA id z62-v6sm2553387wmc.10.2018.07.11.15.52.53 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 11 Jul 2018 15:52:54 -0700 (PDT) From: =?utf-8?b?TcOhdMOpIEVja2w=?= To: netfilter-devel@vger.kernel.org Subject: [PATCH nf-next] netfilter: nf_tables: Expose socket mark Date: Thu, 12 Jul 2018 00:52:16 +0200 Message-Id: <20180711225214.5515-2-ecklm94@gmail.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180711225018.dqknqgi2hif2n5cb@sch.bme.hu> References: <20180711225018.dqknqgi2hif2n5cb@sch.bme.hu> MIME-Version: 1.0 Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org Signed-off-by: Máté Eckl --- include/uapi/linux/netfilter/nf_tables.h | 4 +++- net/netfilter/nft_socket.c | 11 ++++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/include/uapi/linux/netfilter/nf_tables.h b/include/uapi/linux/netfilter/nf_tables.h index 89438e68dc03..f466860bcf75 100644 --- a/include/uapi/linux/netfilter/nf_tables.h +++ b/include/uapi/linux/netfilter/nf_tables.h @@ -921,10 +921,12 @@ enum nft_socket_attributes { /* * enum nft_socket_keys - nf_tables socket expression keys * - * @NFT_SOCKET_TRANSPARENT: Value of the IP(V6)_TRANSPARENT socket option_ + * @NFT_SOCKET_TRANSPARENT: Value of the IP(V6)_TRANSPARENT socket option + * @NFT_SOCKET_MARK: Value of the socket mark */ enum nft_socket_keys { NFT_SOCKET_TRANSPARENT, + NFT_SOCKET_MARK, __NFT_SOCKET_MAX }; #define NFT_SOCKET_MAX (__NFT_SOCKET_MAX - 1) diff --git a/net/netfilter/nft_socket.c b/net/netfilter/nft_socket.c index 74e1b3bd6954..3f46b2013e26 100644 --- a/net/netfilter/nft_socket.c +++ b/net/netfilter/nft_socket.c @@ -40,7 +40,7 @@ static void nft_socket_eval(const struct nft_expr *expr, } if(!sk) { - nft_reg_store8(dest, 0); + *dest = 0; return; } @@ -51,6 +51,12 @@ static void nft_socket_eval(const struct nft_expr *expr, case NFT_SOCKET_TRANSPARENT: nft_reg_store8(dest, inet_sk_transparent(sk)); break; + case NFT_SOCKET_MARK: + if (sk_fullsock(sk)) + *dest = inet_request_mark(sk, skb); + else + *dest = 0; + break; default: WARN_ON(1); regs->verdict.code = NFT_BREAK; @@ -88,6 +94,9 @@ static int nft_socket_init(const struct nft_ctx *ctx, case NFT_SOCKET_TRANSPARENT: len = sizeof(u8); break; + case NFT_SOCKET_MARK: + len = sizeof(u32); + break; default: return -EOPNOTSUPP; }