Make the code for resolving symlinks in lockfile.c more robust as
follows:
1. Handle relative symlinks
2. recursively resolve symlink chains up to OS limit
Signed-off-by: Bradford C. Smith <bradford.carl.smith@xxxxxxxxx>
---
I have updated this patch as follows based partly on Junio's comments.
1. Made comment and coding style consistent with existing git
code base.
2. improved readability
3. rebased to latest version of master (2007-07-26) and updated
commit message appropriately
4. added warning messages for error conditions
5. resolve symlinks to non-existent files
lockfile.c | 128 +++++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 114 insertions(+), 14 deletions(-)
diff --git a/lockfile.c b/lockfile.c
index 9202472..864ce73 100644
--- a/lockfile.c
+++ b/lockfile.c
@@ -25,23 +25,123 @@ static void remove_lock_file_on_signal(int signo)
raise(signo);
}
+/*
+ * p = absolute or relative path name
+ *
+ * Return a pointer into p showing the beginning of the last path name
+ * element. If p is empty or the root directory ("/"), just return p.
+ */
+static const char *last_path_elm(const char *p)
+{
+ /* r starts pointing to null at the end of the string */
+ const char *r = strchr(p, '\0');
+
+ if (r == p)
+ return p; /* just return empty string */
+
+ r--; /* back up to last non-null character */
+
+ /* back up past trailing slashes, if any */
+ while (r > p && *r == '/') {
+ r--;
+ }
+ /*
+ * then go backwards until I hit a slash, or the beginning of
+ * the string
+ */
+ while (r > p && *(r-1) != '/') {
+ r--;
+ }
+ return r;
+}
+
+
+/*
+ * p = path that may be a symlink
+ * s = full size of p
+ *
+ * If p is a symlink, attempt to overwrite p with a path to the real
+ * file or directory (which may or may not exist), following a chain of
+ * symlinks if necessary. Otherwise, leave p unmodified.
+ *
+ * This is a best-effort routine. If an error occurs, p will either be
+ * left unmodified or will name a different symlink in a symlink chain
+ * that started with p's initial contents.
+ *
+ * Always returns p.
+ */
+static char *resolve_symlink(char * p, size_t s)
+{
+ struct stat stb;
+ char link[PATH_MAX];
+ int link_len;
+
+ /*
+ * leave p unchanged if it doesn't appear to be a valid path to
+ * a symlink.
+ */
+ if (lstat(p, &stb) != 0 || !S_ISLNK(stb.st_mode)) {
+ return p;
+ }
+ /*
+ * don't attempt to resolve a chain or loop of symlinks the OS
+ * cannot resolve.
+ */
+ if (stat(p, &stb) != 0 && ELOOP == errno) {
+ warning("%s: %s", p, strerror(ELOOP));
+ return p;
+ }
+
+ link_len = readlink(p, link, sizeof(link));
+ if (link_len < 0) {
+ warning("%s: %s", p, strerror(errno));
+ return p;
+ } else if (link_len < sizeof(link)) {
+ /* readlink() never null-terminates */
+ link[link_len] = '\0';
+ } else {
+ warning("%s: symlink too long", p);
+ return p;
+ }
+
+ if (link[0] == '/') {
+ /* absolute path simply replaces p */
+ if (link_len < s) {
+ strcpy(p, link);
+ } else {
+ warning("%s: symlink too long", p);
+ return p;
+ }
+ } else {
+ /*
+ * link is a relative path, so I must replace the last
+ * element of p with it.
+ */
+ char *r = (char*)last_path_elm(p);
+ if (r - p + link_len < s) {
+ strcpy(r, link);
+ } else {
+ warning("%s: symlink too long", p);
+ return p;
+ }
+ }
+ /* try again in case we've resolved to another symlink */
+ return resolve_symlink(p, s);
+}
+
+
static int lock_file(struct lock_file *lk, const char *path)
{
int fd;
- struct stat st;
-
- if ((!lstat(path, &st)) && S_ISLNK(st.st_mode)) {
- ssize_t sz;
- static char target[PATH_MAX];
- sz = readlink(path, target, sizeof(target));
- if (sz < 0)
- warning("Cannot readlink %s", path);
- else if (target[0] != '/')
- warning("Cannot lock target of relative symlink %s", path);
- else
- path = target;
- }
- sprintf(lk->filename, "%s.lock", path);
+
+ if (strlen(path) >= sizeof(lk->filename)) return -1;
+ strcpy(lk->filename, path);
+ /*
+ * subtract 5 from size to make sure there's room for adding
+ * ".lock" for the lock file name
+ */
+ resolve_symlink(lk->filename, sizeof(lk->filename)-5);
+ strcat(lk->filename, ".lock");
fd = open(lk->filename, O_RDWR | O_CREAT | O_EXCL, 0666);
if (0 <= fd) {
if (!lock_file_list) {
--
1.5.3.rc3.9.g1b487
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
