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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4C823C77B78 for ; Wed, 3 May 2023 12:56:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229948AbjECM4k (ORCPT ); Wed, 3 May 2023 08:56:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57118 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229967AbjECM4j (ORCPT ); Wed, 3 May 2023 08:56:39 -0400 Received: from mail-wm1-x329.google.com (mail-wm1-x329.google.com [IPv6:2a00:1450:4864:20::329]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A59E159C3 for ; Wed, 3 May 2023 05:56:37 -0700 (PDT) Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-3f182d745deso50070175e9.0 for ; Wed, 03 May 2023 05:56:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1683118596; x=1685710596; h=mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:from:to:cc:subject:date:message-id:reply-to; bh=4PaN7k8QmumPf5yonpUhN+ccIQi4usgxeDG8OeijXwc=; b=C38ryPz3KWYqIrzP9PqPJyMSZwlMTmuDIvVU0bnKdJeIIUhATtqxd8Qo4PU8ZFL6YG U8inFDMXPm4yfHmIJ1GNkLWR59xIpQc3v23FgcfraF0ORhvGK8xMoCwuhqByNX3eK48I xbBag1p3XWSsUJzy/u9jy2hajGkXsFkZCY7MA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683118596; x=1685710596; h=mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=4PaN7k8QmumPf5yonpUhN+ccIQi4usgxeDG8OeijXwc=; b=ZmYXj9qEXsvZLJjZnankO6BrIlsB8/ZiGTIOw7G1/roHTnoJpgVfGVd6DSczq5qvxH g2xEI/3EPTeMTl5XpMMWGIHIfekXv/7oea98u2tFTk6TGZHEPR6QkoVvcmo4lgy44VDQ 834BcwUW/sa2ZhJ8n7gocJSUs2lLvSwHLHjaFAYZp9K/+EigI9cR5JbjqaJL4VG8SlbE O+Gc8SRoxDLEMmkteaA7j1hmGxBgxHHmnilgxcFegFdiTjEmgeXZMouuB7FbuLzkQZvm uwKgI0QMMHWkYANsSC+C/8qLQsE71v2/t4YfnA8u1F6qy7tA9i2Ie1NFLFfsgyLeUCeq ON1g== X-Gm-Message-State: AC+VfDwKozJ7tJ9mZthisxgtEIUEmHr6tvOLxQSGC6XnQOOLhZiU7VvI uW0WHl00OTq4+2PRr4JblHGW/n6pdw/LgXlbAVq85XN1gG60BLpXyVlgi+2fVtKPyjYWiaRpJUo QlYQIB68QlyV96osLMkeSd/zvx1HNiM83sqZjClEKvqwCHysmFnsPELhUIPFBDPvStbHHxA1H+T zD5D2dOOpFab/2+8L1MLVkkg== X-Google-Smtp-Source: ACHHUZ5HIZPcoK9+Qe5hwR8vAbyccuHj9M04bkLD4OtXvMKyNW2ubo+14pX82+PamOg/4hKhGmrAKg== X-Received: by 2002:a1c:4c09:0:b0:3f1:9be0:b39f with SMTP id z9-20020a1c4c09000000b003f19be0b39fmr16350050wmf.8.1683118595836; Wed, 03 May 2023 05:56:35 -0700 (PDT) Received: from localhost.localdomain ([192.19.250.250]) by smtp.gmail.com with ESMTPSA id u6-20020a05600c00c600b003ee1b2ab9a0sm1855396wmm.11.2023.05.03.05.56.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 May 2023 05:56:35 -0700 (PDT) From: Boris Sukholitko To: netfilter-devel@vger.kernel.org Cc: Ilya Lifshits , Boris Sukholitko Subject: [PATCH nf-next 17/19] netfilter: nftables: payload save mechanism Date: Wed, 3 May 2023 15:55:50 +0300 Message-Id: <20230503125552.41113-18-boris.sukholitko@broadcom.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20230503125552.41113-1-boris.sukholitko@broadcom.com> References: <20230503125552.41113-1-boris.sukholitko@broadcom.com> MIME-Version: 1.0 Content-Type: multipart/signed; protocol="application/pkcs7-signature"; micalg=sha-256; boundary="000000000000095b7805fac99626" Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org --000000000000095b7805fac99626 Content-Transfer-Encoding: 8bit nf_flow_offload_save_payload saves the payload in the nftables conntrack extension so that nf_flow_offload_apply_payload can apply it later. Signed-off-by: Boris Sukholitko --- include/net/netfilter/nf_tables.h | 11 +++++++++++ net/netfilter/nft_conntrack_ext.c | 30 ++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+) diff --git a/include/net/netfilter/nf_tables.h b/include/net/netfilter/nf_tables.h index 48357db14602..6bfb38738838 100644 --- a/include/net/netfilter/nf_tables.h +++ b/include/net/netfilter/nf_tables.h @@ -1762,6 +1762,10 @@ int nf_flow_offload_apply_payload(struct sk_buff *skb, struct nf_conn *ct, enum ip_conntrack_dir dir, unsigned int thoff); + +int nf_flow_offload_save_payload(struct sk_buff *skb, + const struct nft_payload_set *priv, + const u32 *src); #else static inline void nfct_nft_ext_add(struct nf_conn *ct) { @@ -1774,6 +1778,13 @@ static inline int nf_flow_offload_apply_payload(struct sk_buff *skb, { return 0; } + +static inline int nf_flow_offload_save_payload(struct sk_buff *skb, + const struct nft_payload_set *priv, + const u32 *src) +{ + return -1; +} #endif #endif /* _NET_NF_TABLES_H */ diff --git a/net/netfilter/nft_conntrack_ext.c b/net/netfilter/nft_conntrack_ext.c index 0dabd2a84422..750aeaaf2928 100644 --- a/net/netfilter/nft_conntrack_ext.c +++ b/net/netfilter/nft_conntrack_ext.c @@ -1,6 +1,36 @@ // SPDX-License-Identifier: GPL-2.0 #include +int nf_flow_offload_save_payload(struct sk_buff *skb, + const struct nft_payload_set *priv, + const u32 *src) +{ + struct nf_conn_nft_ext_entry *en; + enum ip_conntrack_info ctinfo; + struct nf_conn_nft_ext *ncft; + struct nf_conn *ct; + + ct = nf_ct_get(skb, &ctinfo); + if (!ct) + goto err; + + ncft = nf_ct_ext_find(ct, NF_CT_EXT_NFT_EXT); + if (!ncft) + goto err; + + en = &ncft->nfte_entries[CTINFO2DIR(ctinfo)]; + if (en->nfte_type != NFT_EXT_UNDEFINED) + goto err; + + en->nfte_type = NFT_EXT_PAYLOAD_SET; + en->nfte_data = *src; + memcpy(&en->nfte_payload, priv, sizeof(*priv)); + return 0; +err: + return -1; +} +EXPORT_SYMBOL_GPL(nf_flow_offload_save_payload); + int nf_flow_offload_apply_payload(struct sk_buff *skb, struct nf_conn *ct, enum ip_conntrack_dir dir, -- 2.32.0 --000000000000095b7805fac99626 Content-Type: application/pkcs7-signature; name="smime.p7s" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="smime.p7s" Content-Description: S/MIME Cryptographic Signature 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 riBJ/K1AFUjRAjFhGV64l++td7dkmnq/X8ET75ti+w1s4FRpFqkD2m7pg5NxdsZphYIXAgMBAAGj QjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBSP8Et/qC5FJK5N UPpjmove4t0bvDANBgkqhkiG9w0BAQsFAAOCAQEAS0DbwFCq/sgM7/eWVEVJu5YACUGssxOGhigH M8pr5nS5ugAtrqQK0/Xx8Q+Kv3NnSoPHRHt44K9ubG8DKY4zOUXDjuS5V2yq/BKW7FPGLeQkbLmU Y/vcU2hnVj6DuM81IcPJaP7O2sJTqsyQiunwXUaMld16WCgaLx3ezQA3QY/tRG3XUyiXfvNnBB4V 14qWtNPeTCekTBtzc3b0F5nCH3oO4y0IrQocLP88q1UOD5F+NuvDV0m+4S4tfGCLw0FREyOdzvcy a5QBqJnnLDMfOjsl0oZAzjsshnjJYS8Uuu7bVW/fhO4FCU29KNhyztNiUGUe65KXgzHZs7XKR1g/ XzCCBVgwggRAoAMCAQICDADJ2jIiOyGGK/8iRTANBgkqhkiG9w0BAQsFADBbMQswCQYDVQQGEwJC RTEZMBcGA1UEChMQR2xvYmFsU2lnbiBudi1zYTExMC8GA1UEAxMoR2xvYmFsU2lnbiBHQ0MgUjMg UGVyc29uYWxTaWduIDIgQ0EgMjAyMDAeFw0yMjA5MTAxMTU2MDBaFw0yNTA5MTAxMTU2MDBaMIGW MQswCQYDVQQGEwJJTjESMBAGA1UECBMJS2FybmF0YWthMRIwEAYDVQQHEwlCYW5nYWxvcmUxFjAU BgNVBAoTDUJyb2FkY29tIEluYy4xGTAXBgNVBAMTEEJvcmlzIFN1a2hvbGl0a28xLDAqBgkqhkiG 9w0BCQEWHWJvcmlzLnN1a2hvbGl0a29AYnJvYWRjb20uY29tMIIBIjANBgkqhkiG9w0BAQEFAAOC AQ8AMIIBCgKCAQEA1uKd0fo+YWpPYs389dpHW5vbrVQvwiWI4VGPHISUMVVVcCwrVXMcmoEi1AMN t+KhIYltFzX7vj+SjHzSWLGrXUX/DW2tDJRYRXdc8+lVAu1wBO4WIhcYCMY8BDPfpxkMoY4w/qIa 1rC9tzBPzIGAdrBfdEzjjqblnqi+sIG7bakS6h7njOPNf9HuyLSQOs+Qq3kK8A8pX6t6KtAdq4iP td/fua/xzT9yf7xQ0v0AVUPd9O3rahX4kX4sHlUcEVb6eXSNRwdyirUgDaJkDPrhIPKFapov5OeK 9BR0SGqf9JnBbAcQrigtBfEwkeDY+dJprju7HLWVNFkaW9u8vvvbiwIDAQABo4IB3jCCAdowDgYD VR0PAQH/BAQDAgWgMIGjBggrBgEFBQcBAQSBljCBkzBOBggrBgEFBQcwAoZCaHR0cDovL3NlY3Vy ZS5nbG9iYWxzaWduLmNvbS9jYWNlcnQvZ3NnY2NyM3BlcnNvbmFsc2lnbjJjYTIwMjAuY3J0MEEG CCsGAQUFBzABhjVodHRwOi8vb2NzcC5nbG9iYWxzaWduLmNvbS9nc2djY3IzcGVyc29uYWxzaWdu MmNhMjAyMDBNBgNVHSAERjBEMEIGCisGAQQBoDIBKAowNDAyBggrBgEFBQcCARYmaHR0cHM6Ly93 d3cuZ2xvYmFsc2lnbi5jb20vcmVwb3NpdG9yeS8wCQYDVR0TBAIwADBJBgNVHR8EQjBAMD6gPKA6 hjhodHRwOi8vY3JsLmdsb2JhbHNpZ24uY29tL2dzZ2NjcjNwZXJzb25hbHNpZ24yY2EyMDIwLmNy bDAoBgNVHREEITAfgR1ib3Jpcy5zdWtob2xpdGtvQGJyb2FkY29tLmNvbTATBgNVHSUEDDAKBggr BgEFBQcDBDAfBgNVHSMEGDAWgBSWM9HmWBdbNHWKgVZk1b5I3qGPzzAdBgNVHQ4EFgQUB46dIlYd tkC0osZXFEatb5Hu+C8wDQYJKoZIhvcNAQELBQADggEBAE/WXEAo/TOHDort0zhfb2Vu7BdK2MHO 7LVlNc5DtQqFW4S0EA+f5oxpwsTHSzqf5FVY3S3TeMGTGssz2y/nGWwznbP+ti0SmO13EYKODFao 6fOqaW6dPraTx2lXgvMYXn/VZ+bxpnyKcFwC4qVssadK6ezPvrCVszHmO7MNvpH2vsfE5ulVdzbU zPffqO2QS6e4oXzmoYuX9sCNfol1TaQgCYgYoC4rexOBLLtYbwdKWi3/ttntZ2PHS1QRaDzrBSuw L39zqstTC0LC/YoSKC/cU9igMELugG/Twy9uVlg2XXTY1wUYSWMsYlpydsrVyG18UScp7FlGFbWX EWKS7pkxggJtMIICaQIBATBrMFsxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52 LXNhMTEwLwYDVQQDEyhHbG9iYWxTaWduIEdDQyBSMyBQZXJzb25hbFNpZ24gMiBDQSAyMDIwAgwA ydoyIjshhiv/IkUwDQYJYIZIAWUDBAIBBQCggdQwLwYJKoZIhvcNAQkEMSIEIMJeS2cSThe379Pf 8VbvM0wx/1YgUy2JECabLiaZc149MBgGCSqGSIb3DQEJAzELBgkqhkiG9w0BBwEwHAYJKoZIhvcN AQkFMQ8XDTIzMDUwMzEyNTYzNlowaQYJKoZIhvcNAQkPMVwwWjALBglghkgBZQMEASowCwYJYIZI AWUDBAEWMAsGCWCGSAFlAwQBAjAKBggqhkiG9w0DBzALBgkqhkiG9w0BAQowCwYJKoZIhvcNAQEH MAsGCWCGSAFlAwQCATANBgkqhkiG9w0BAQEFAASCAQBvVRXPHuGndQpQI7/YGK9BfyxBBieEimHB EUs0tAFdw+klfcSGUZLpfr3Aq9zekN8ZCnUmlNr9+n1B6v1ZZDo6GuUAKKXceZ4t1ZQaF1oTNkeu YpBB/apX1KcAl3EPpaEEjjjRHXXIXFyf6KWzB1eBWo18nRwydkDq467IAUuV40nZe3MZ4VJrFXlR l6BZXXhzr7lS0W/MwtH8iZdX021Jeb5CKecTyPpHkTTe51WoMatiRNoddm+396pnCDFhaVHfEJIk TJCrWBb+rGDCrih6HbZjInWEEhfyj/uk+x2k25b0x6UgQHypglorFLgLjJh/DRABQiug2w+X13EV gik9 --000000000000095b7805fac99626--