<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[127673] trunk/base/src/darwintracelib1.0/darwintrace.c</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/127673">127673</a></dd>
<dt>Author</dt> <dd>cal@macports.org</dd>
<dt>Date</dt> <dd>2014-10-31 18:16:19 -0700 (Fri, 31 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>base: trace mode: deal with resource forks, add error checks, use getattrlist(2) over getcwd(3), closes #44240
- Strip resource forks, fixes #44240.
- Add error checking to deal with buffer overflows due to very long paths in
darwintrace.dylib.
- Remove useless call to strlen("filemap\t") to save the runtime cost.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbasesrcdarwintracelib10darwintracec">trunk/base/src/darwintracelib1.0/darwintrace.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbasesrcdarwintracelib10darwintracec"></a>
<div class="modfile"><h4>Modified: trunk/base/src/darwintracelib1.0/darwintrace.c (127672 => 127673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/darwintracelib1.0/darwintrace.c 2014-11-01 00:41:11 UTC (rev 127672)
+++ trunk/base/src/darwintracelib1.0/darwintrace.c 2014-11-01 01:16:19 UTC (rev 127673)
</span><span class="lines">@@ -44,6 +44,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #include <errno.h>
</span><ins>+#include <inttypes.h>
</ins><span class="cx"> #include <pthread.h>
</span><span class="cx"> #include <string.h>
</span><span class="cx"> #include <sys/attr.h>
</span><span class="lines">@@ -309,7 +310,7 @@
</span><span class="cx"> free(newfilemap);
</span><span class="cx"> if (filemap != NULL)
</span><span class="cx"> break;
</span><del>- newfilemap = __send("filemap\t", (uint32_t) strlen("filemap\t"), 1);
</del><ins>+ newfilemap = __send("filemap\t", 8, 1);
</ins><span class="cx"> } while (!CAS(NULL, newfilemap, &filemap));
</span><span class="cx">
</span><span class="cx"> #if DARWINTRACE_DEBUG && 0
</span><span class="lines">@@ -422,7 +423,11 @@
</span><span class="cx"> char logbuffer[BUFFER_SIZE];
</span><span class="cx">
</span><span class="cx"> size = snprintf(logbuffer, sizeof(logbuffer), "%s\t%s", op, path);
</span><del>- __send(logbuffer, size, 0);
</del><ins>+ // Check if the buffer was short. If it was, discard the message silently,
+ // assuming it isn't important enough to error out.
+ if (size < BUFFER_SIZE) {
+ __send(logbuffer, size, 0);
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -452,7 +457,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> len = snprintf(buffer, sizeof(buffer), "dep_check\t%s", path);
</span><del>- if (len > sizeof(buffer)) {
</del><ins>+ if (len >= sizeof(buffer)) {
+ fprintf(stderr, "darwintrace: truncating buffer length from %" PRIu32 " to %zu.", len, sizeof(buffer) - 1);
</ins><span class="cx"> len = sizeof(buffer) - 1;
</span><span class="cx"> }
</span><span class="cx"> p = __send(buffer, len, 1);
</span><span class="lines">@@ -660,6 +666,7 @@
</span><span class="cx"> bool __darwintrace_is_in_sandbox(const char *path, int flags) {
</span><span class="cx"> #define lstat(x, y) syscall(LSTATSYSNUM, (x), (y))
</span><span class="cx"> #define readlink(x,y,z) syscall(SYS_readlink, (x), (y), (z))
</span><ins>+#define getattrlist(v,w,x,y,z) syscall(SYS_getattrlist, (v), (w), (x), (y), (z))
</ins><span class="cx"> if (!filemap) {
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="lines">@@ -686,12 +693,42 @@
</span><span class="cx"> const char *token = NULL;
</span><span class="cx"> size_t idx;
</span><span class="cx"> if (*path != '/') {
</span><del>- // The path isn't absolute, start by populating pathcomponents with the
- // current working directory
</del><ins>+ /*
+ * The path isn't absolute, start by populating pathcomponents with the
+ * current working directory.
+ *
+ * However, we avoid getcwd(3) if we can and use getattrlist(2) with
+ * ATTR_CMN_FULLPATH instead, because getcwd(3) will open all parent
+ * directories, read them, search for the current component using its
+ * inode obtained from lstat(., .., ../.., etc.) and build the path
+ * this way, which is inefficient and will also call back into
+ * darwintrace code.
+ */
+# ifdef ATTR_CMN_FULLPATH
+ struct attrlist attrlist;
+ attrlist.bitmapcount = ATTR_BIT_MAP_COUNT;
+ attrlist.reserved = 0;
+ attrlist.commonattr = ATTR_CMN_FULLPATH;
+ attrlist.volattr = 0;
+ attrlist.dirattr = 0;
+ attrlist.fileattr = 0;
+ attrlist.forkattr = 0;
+
+ char attrbuf[sizeof(uint32_t) + sizeof(attrreference_t) + (PATH_MAX + 1)];
+ /* attrlength attrref_t for the name UTF-8 name up to PATH_MAX chars */
+
+ if (-1 == (getattrlist(".", &attrlist, attrbuf, sizeof(attrbuf), FSOPT_NOFOLLOW))) {
+ perror("darwintrace: getattrlist");
+ abort();
+ }
+ attrreference_t *nameAttrRef = (attrreference_t *) (attrbuf + sizeof(uint32_t));
+ strlcpy(normPath, ((char *) nameAttrRef) + nameAttrRef->attr_dataoffset, sizeof(normPath));
+# else /* defined(ATTR_CMN_FULLPATH) */
</ins><span class="cx"> if (getcwd(normPath, sizeof(normPath)) == NULL) {
</span><span class="cx"> perror("darwintrace: getcwd");
</span><span class="cx"> abort();
</span><span class="cx"> }
</span><ins>+# endif /* defined(ATTR_CMN_FULLPATH) */
</ins><span class="cx">
</span><span class="cx"> char *writableToken = normPath + 1;
</span><span class="cx"> while ((idx = strcspn(writableToken, "/")) > 0) {
</span><span class="lines">@@ -768,6 +805,13 @@
</span><span class="cx"> token += idx + 1;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ // strip off resource forks
+ if (numComponents >= 2 &&
+ strcmp("..namedfork", pathComponents[numComponents - 2].start) == 0 &&
+ strcmp("rsrc", pathComponents[numComponents - 1].start) == 0) {
+ numComponents -= 2;
+ }
+
</ins><span class="cx"> # ifdef ATTR_CMN_FULLPATH
</span><span class="cx"> if (numComponents >= 3 && strncmp(".vol", pathComponents[0].start, pathComponents[0].len) == 0) {
</span><span class="cx"> // path in VOLFS, try to get inode -> name lookup from getattrlist(2).
</span><span class="lines">@@ -930,6 +974,7 @@
</span><span class="cx"> } while (pathIsSymlink);
</span><span class="cx">
</span><span class="cx"> return __darwintrace_sandbox_check(normPath, flags);
</span><ins>+#undef getattrlist
</ins><span class="cx"> #undef readlink
</span><span class="cx"> #undef lstat
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>