version 1.24, 2025/04/16 05:37:06
|
version 1.25, 2025/04/16 05:57:42
|
Line 24
|
Line 24
|
* along with FreeM. If not, see <https://www.gnu.org/licenses/>. |
* along with FreeM. If not, see <https://www.gnu.org/licenses/>. |
* |
* |
* $Log$ |
* $Log$ |
|
* Revision 1.25 2025/04/16 05:57:42 snw |
|
* Remove non-useful procctl calls |
|
* |
* Revision 1.24 2025/04/16 05:37:06 snw |
* Revision 1.24 2025/04/16 05:37:06 snw |
* Refine FreeBSD ASLR fix |
* Refine FreeBSD ASLR fix |
* |
* |
Line 122
|
Line 125
|
#include <pwd.h> |
#include <pwd.h> |
#include <grp.h> |
#include <grp.h> |
#include "log.h" |
#include "log.h" |
#if defined(__FreeBSD__) |
|
# include <sys/procctl.h> |
|
#endif |
|
#if defined(HAVE_GETOPT_H) |
#if defined(HAVE_GETOPT_H) |
# include <getopt.h> |
# include <getopt.h> |
#endif |
#endif |
Line 218 int main (int argc, char **argv, char **
|
Line 218 int main (int argc, char **argv, char **
|
strcpy (stack0, argv[0]); |
strcpy (stack0, argv[0]); |
stcnv_c2m (stack0); |
stcnv_c2m (stack0); |
|
|
#if defined(__FreeBSD__) |
|
int prcdta = PROC_ASLR_FORCE_DISABLE; |
|
#endif |
|
|
|
/* strncpy (config_file, SYSCONFDIR"/freem.conf", 100); */ |
/* strncpy (config_file, SYSCONFDIR"/freem.conf", 100); */ |
|
|
|
|
Line 760 int main (int argc, char **argv, char **
|
Line 756 int main (int argc, char **argv, char **
|
else { |
else { |
fm_initialized = TRUE; |
fm_initialized = TRUE; |
} |
} |
} |
|
|
|
#if defined(__FreeBSD__) |
|
if ((first_process == FALSE) && (procctl (P_PID, getpid (), PROC_ASLR_CTL, &prcdta) == -1)) { |
|
fprintf (stderr, "freem: could not disable address space layout randomization for pid %ld; program operation may be unreliable [error %s]\n", getpid(), strerror (errno)); |
|
} |
} |
#endif |
|
|
|
|
|
if (first_process == TRUE) { |
if (first_process == TRUE) { |
|
|