hardenedbsd/HardenedBSD
1
0
Fork 0
mirror of https://git.hardenedbsd.org/hardenedbsd/HardenedBSD.git synced 2024-11-24 01:07:21 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

HBSD: Resolve merge conflict

Browse Source 
Even though one file was conflicted, the value being hardened was moved
to a different file. So this conflict has to files modified in order to
keep the hardening in place.

Signed-off-by:	Shawn Webb <shawn.webb@hardenedbsd.org>
This commit is contained in:
Shawn Webb 2024-03-25 18:43:55 +00:00
parent dd544859bc
commit b5ccb62107
No known key found for this signature in database
2 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sys/netinet6/icmp6.c
View File

@ -65,6 +65,7 @@
#include "opt_inet.h"
#include "opt_inet6.h"
#include "opt_pax.h"
#include <sys/param.h>
#include <sys/domain.h>
@ -122,7 +123,11 @@ SYSCTL_VNET_PCPUSTAT(_net_inet6_icmp6, ICMPV6CTL_STATS, stats,
VNET_PCPUSTAT_SYSUNINIT(icmp6stat);
#endif /* VIMAGE */
#ifdef PAX_HARDENING
VNET_DEFINE_STATIC(int, icmp6_rediraccept) = 0;
#else
VNET_DEFINE_STATIC(int, icmp6_rediraccept) = 1;
#endif
#define V_icmp6_rediraccept VNET(icmp6_rediraccept)
SYSCTL_INT(_net_inet6_icmp6, ICMPV6CTL_REDIRACCEPT, rediraccept,
CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(icmp6_rediraccept), 0,

15
sys/netinet6/in6_proto.c
View File

@ -191,21 +191,6 @@ VNET_DEFINE(bool, ip6_log_cannot_forward) = 1;
VNET_DEFINE(int, pmtu_expire) = 60*10;
VNET_DEFINE(int, pmtu_probe) = 60*2;
<<<<<<< HEAD
/* ICMPV6 parameters */
#ifdef PAX_HARDENING
VNET_DEFINE(int, icmp6_rediraccept) = 0;/* accept and process redirects */
#else
VNET_DEFINE(int, icmp6_rediraccept) = 1;/* accept and process redirects */
#endif
VNET_DEFINE(int, icmp6_redirtimeout) = 10 * 60; /* 10 minutes */
VNET_DEFINE(int, icmp6errppslim) = 100; /* 100pps */
/* control how to respond to NI queries */
VNET_DEFINE(int, icmp6_nodeinfo) = 0;
VNET_DEFINE(int, icmp6_nodeinfo_oldmcprefix) = 1;
=======
>>>>>>> internal/freebsd/current/main
VNET_DEFINE_STATIC(int, ip6_log_interval) = 5;
VNET_DEFINE_STATIC(int, ip6_log_count) = 0;
VNET_DEFINE_STATIC(struct timeval, ip6_log_last) = { 0 };