1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
|
--- ./source3/lib/fault.c.orig 2010-04-01 15:26:22.000000000 +0200
+++ ./source3/lib/fault.c 2010-04-23 01:08:35.000000000 +0200
@@ -26,6 +26,10 @@
#endif
+#ifdef HAVE_SYS_SYSCTL_H
+#include <sys/sysctl.h>
+#endif
+
#ifdef HAVE_SYS_PRCTL_H
#include <sys/prctl.h>
#endif
@@ -144,52 +148,93 @@
* before dump_core() calls abort.
*/
#if (defined(FREEBSD) && defined(HAVE_SYSCTLBYNAME))
-static char *get_freebsd_corepath(void)
+/*
+ * Expand the name described in corefilename, using name, uid, and pid.
+ * corefilename is a printf-like string, with three format specifiers:
+ * %N name of process ("name")
+ * %P process id (pid)
+ * %U user id (uid)
+ * For example, "%N.core" is the default; they can be disabled completely
+ * by using "/dev/null", or all core files can be stored in "/cores/%U/%N-%P".
+ */
+static char *get_freebsd_corepath(const char *name)
{
- char *tmp_corepath = NULL;
- char *end = NULL;
- size_t len = 128;
+ TALLOC_CTX *tmp_ctx;
+ char format[MAXPATHLEN];
+ char *freebsd_corepath = NULL, *buffer = NULL;
+ char *start, *end;
+ size_t len;
int ret;
- /* Loop with increasing sizes so we don't allocate too much. */
- do {
- if (len > 1024) {
- goto err_out;
- }
-
- tmp_corepath = (char *)talloc_realloc(NULL, tmp_corepath,
- char, len);
- if (!tmp_corepath) {
- return NULL;
- }
-
- ret = sysctlbyname("kern.corefile", tmp_corepath, &len, NULL,
- 0);
- if (ret == -1) {
- if (errno != ENOMEM) {
- DEBUG(0, ("sysctlbyname failed getting "
- "kern.corefile %s\n",
- strerror(errno)));
- goto err_out;
- }
-
- /* Not a large enough array, try a bigger one. */
- len = len << 1;
- }
- } while (ret == -1);
-
+ len = sizeof(format);
+ /* Read format string */
+ if((ret = sysctlbyname("kern.corefile", format, &len, NULL, 0)) == -1) {
+ return NULL;
+ }
/* Strip off the common filename expansion */
- if ((end = strrchr_m(tmp_corepath, '/'))) {
+ if ((end=strrchr_m(format, '/')) != NULL) {
*end = '\0';
}
+ /* Core file is relative to the cwd */
+ if(!format[0] || format[0] != '/') {
+ return NULL;
+ }
- return tmp_corepath;
-
- err_out:
- if (tmp_corepath) {
- talloc_free(tmp_corepath);
+ if((tmp_ctx = talloc_new(NULL)) == NULL) {
+ DEBUG(0, ("talloc_new failed\n"));
+ return NULL;
}
- return NULL;
+ if((buffer = talloc_strdup(tmp_ctx, "")) == NULL) {
+ DEBUG(0, ("talloc_strdup: Out of memory!\n"));
+ goto failed;
+ }
+ /* Parse format string and expand variables */
+ start = format;
+ while((end=strchr_m(start, '%')) != NULL) {
+ /* Copy part of the string without format arguments */
+ if(end != start) {
+ buffer = talloc_strndup_append_buffer(buffer, start, end - start);
+ if(buffer == NULL) {
+ DEBUG(0, ("talloc_strdup: Out of memory!\n"));
+ goto failed;
+ }
+ }
+ start = end + 1;
+ switch (*start) {
+ case '%':
+ buffer = talloc_strdup_append_buffer(buffer, "%%");
+ break;
+ case 'N': /* process name */
+ buffer = talloc_asprintf_append_buffer(buffer, "%s", name);
+ break;
+ case 'P': /* process id */
+ buffer = talloc_asprintf_append_buffer(buffer, "%u", getpid());
+ break;
+ case 'U': /* user id */
+ buffer = talloc_asprintf_append_buffer(buffer, "%u", getuid());
+ break;
+ default:
+ DEBUG(0,(
+ "Unknown format character %c in "
+ "corename `%s'\n", *start, format));
+ }
+ if(buffer == NULL) {
+ DEBUG(0, ("talloc_asprintf_append_buffer: Out of memory!\n"));
+ goto failed;
+ }
+ start++;
+ }
+ /* Copy remaining part, if any */
+ if((buffer = talloc_strdup_append_buffer(buffer, start)) == NULL) {
+ DEBUG(0, ("talloc_strdup_append_buffer: Out of memory!\n"));
+ goto failed;
+ }
+ /* Duplicate assembled string in the unattached contenxt */
+ freebsd_corepath = talloc_strdup(NULL, buffer);
+failed:
+ TALLOC_FREE(tmp_ctx);
+
+ return freebsd_corepath;
}
#endif
@@ -248,8 +293,7 @@
{
#if (defined(FREEBSD) && defined(HAVE_SYSCTLBYNAME))
char *tmp_corepath = NULL;
- tmp_corepath = get_freebsd_corepath();
-
+ tmp_corepath = get_freebsd_corepath(progname);
/* If this has been set correctly, we're done. */
if (tmp_corepath) {
return tmp_corepath;
@@ -327,7 +371,7 @@
SAFE_FREE(logbase);
}
- void dump_core(void)
+void dump_core(void)
{
static bool called;
|
