aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKristof Provost <kp@FreeBSD.org>2021-05-16 06:50:17 +0000
committerKristof Provost <kp@FreeBSD.org>2021-05-24 15:38:22 +0000
commit31424ca0a1d02d10011f2d3c32d49c8e8a3e7c96 (patch)
tree2a8bfd1b92606d473e8c205770997cd3106db2f0
parent22d8055aa216b2e39ec48ddaeab31d542fb96bee (diff)
downloadsrc-31424ca0a1d02d10011f2d3c32d49c8e8a3e7c96.tar.gz
src-31424ca0a1d02d10011f2d3c32d49c8e8a3e7c96.zip
pf: Set the pfik_group for userspace
Userspace relies on this pointer to work out if the kif is a group or not. It can't use it for anything else, because it's a pointer to a kernel address. Substitute 0xfeedc0de for 'true', so that we don't leak kernel memory addresses to userspace. PR: 255852 Reviewed by: donner MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D30284 (cherry picked from commit d69cc040147284c414dfd1c9f498dcc7c8291a8b)
-rw-r--r--sys/netpfil/pf/pf_if.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/sys/netpfil/pf/pf_if.c b/sys/netpfil/pf/pf_if.c
index 4630098221c8..3c9b53daa28c 100644
--- a/sys/netpfil/pf/pf_if.c
+++ b/sys/netpfil/pf/pf_if.c
@@ -831,6 +831,14 @@ pf_kkif_to_kif(const struct pfi_kkif *kkif, struct pfi_kif *kif)
kif->pfik_flags = kkif->pfik_flags;
kif->pfik_tzero = kkif->pfik_tzero;
kif->pfik_rulerefs = kkif->pfik_rulerefs;
+ /*
+ * Userspace relies on this pointer to decide if this is a group or
+ * not. We don't want to share the actual pointer, because it's
+ * useless to userspace and leaks kernel memory layout information.
+ * So instead we provide 0xfeedcode as 'true' and NULL as 'false'.
+ */
+ kif->pfik_group =
+ kkif->pfik_group ? (struct ifg_group *)0xfeedc0de : NULL;
}
void