Merge tag 'dma-mapping-5.19-2022-05-25' of git://git.infradead.org/users/hch/dma...

[linux-block.git] / include / net / netfilter / nf_conntrack_labels.h

diff --git a/include/net/netfilter/nf_conntrack_labels.h b/include/net/netfilter/nf_conntrack_labels.h
index 3c23298e68ca46638bd060a75fe174463d708126..66bab6c60d12b52dde1066a7236046a78b8b1f78 100644 (file)
--- a/include/net/netfilter/nf_conntrack_labels.h
+++ b/include/net/netfilter/nf_conntrack_labels.h
@@ -17,10 +17,18 @@ struct nf_conn_labels {
        unsigned long bits[NF_CT_LABELS_MAX_SIZE / sizeof(long)];
 };
 
+/* Can't use nf_ct_ext_find(), flow dissector cannot use symbols
+ * exported by nf_conntrack module.
+ */
 static inline struct nf_conn_labels *nf_ct_labels_find(const struct nf_conn *ct)
 {
 #ifdef CONFIG_NF_CONNTRACK_LABELS
-       return nf_ct_ext_find(ct, NF_CT_EXT_LABELS);
+       struct nf_ct_ext *ext = ct->ext;
+
+       if (!ext || !__nf_ct_ext_exist(ext, NF_CT_EXT_LABELS))
+               return NULL;
+
+       return (void *)ct->ext + ct->ext->offset[NF_CT_EXT_LABELS];
 #else
        return NULL;
 #endif