From: Tom Yu <tlyu@mit.edu>
Date: Wed, 15 Dec 2004 20:41:20 +0000 (+0000)
Subject: pullup from trunk
X-Git-Tag: krb5-1.4.3-beta1~139
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d8894727ff347d32e5dea1dba547c88d78e03b1e;p=krb5.git

pullup from trunk

ticket: 2812
version_fixed: 1.4

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-4@16942 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/util/profile/ChangeLog b/src/util/profile/ChangeLog
index 1499d25a0..bfe663636 100644
--- a/src/util/profile/ChangeLog
+++ b/src/util/profile/ChangeLog
@@ -1,3 +1,9 @@
+2004-12-14  Ken Raeburn  <raeburn@mit.edu>
+
+	* prof_tree.c (profile_node_iterator): When the iterator has a
+	current file, lock it, and unlock it before changing it or
+	returning.
+
 2004-11-04  Alexandra Ellwood  <lxs@mit.edu>
 
 	* prof_init.c, profile.hin: added profile_is_modified
diff --git a/src/util/profile/prof_tree.c b/src/util/profile/prof_tree.c
index 1d96ffbb8..eea34f60b 100644
--- a/src/util/profile/prof_tree.c
+++ b/src/util/profile/prof_tree.c
@@ -466,17 +466,27 @@ errcode_t profile_node_iterator(void **iter_p, struct profile_node **ret_node,
 	 * If the file has changed, then the node pointer is invalid,
 	 * so we'll have search the file again looking for it.
 	 */
+	if (iter->file) {
+	    retval = k5_mutex_lock(&iter->file->data->lock);
+	    if (retval)
+		return retval;
+	}
 	if (iter->node && (iter->file->data->upd_serial != iter->file_serial)) {
 		iter->flags &= ~PROFILE_ITER_FINAL_SEEN;
 		skip_num = iter->num;
 		iter->node = 0;
 	}
-	if (iter->node && iter->node->magic != PROF_MAGIC_NODE)
+	if (iter->node && iter->node->magic != PROF_MAGIC_NODE) {
+	    if (iter->file)
+		k5_mutex_unlock(&iter->file->data->lock);
 	    return PROF_MAGIC_NODE;
+	}
 get_new_file:
 	if (iter->node == 0) {
 		if (iter->file == 0 ||
 		    (iter->flags & PROFILE_ITER_FINAL_SEEN)) {
+			if (iter->file)
+			    k5_mutex_unlock(&iter->file->data->lock);
 			profile_node_iterator_free(iter_p);
 			if (ret_node)
 				*ret_node = 0;
@@ -486,10 +496,18 @@ get_new_file:
 				*ret_value =0;
 			return 0;
 		}
+		k5_mutex_unlock(&iter->file->data->lock);
 		if ((retval = profile_update_file(iter->file))) {
 		    if (retval == ENOENT || retval == EACCES) {
 			/* XXX memory leak? */
 			iter->file = iter->file->next;
+			if (iter->file) {
+			    retval = k5_mutex_lock(&iter->file->data->lock);
+			    if (retval) {
+				profile_node_iterator_free(iter_p);
+				return retval;
+			    }
+			}
 			skip_num = 0;
 			retval = 0;
 			goto get_new_file;
@@ -498,6 +516,11 @@ get_new_file:
 			return retval;
 		    }
 		}
+		retval = k5_mutex_lock(&iter->file->data->lock);
+		if (retval) {
+		    profile_node_iterator_free(iter_p);
+		    return retval;
+		}
 		iter->file_serial = iter->file->data->upd_serial;
 		/*
 		 * Find the section to list if we are a LIST_SECTION,
@@ -518,7 +541,15 @@ get_new_file:
 				iter->flags |= PROFILE_ITER_FINAL_SEEN;
 		}
 		if (!section) {
+			k5_mutex_unlock(&iter->file->data->lock);
 			iter->file = iter->file->next;
+			if (iter->file) {
+			    retval = k5_mutex_lock(&iter->file->data->lock);
+			    if (retval) {
+				profile_node_iterator_free(iter_p);
+				return retval;
+			    }
+			}
 			skip_num = 0;
 			goto get_new_file;
 		}
@@ -546,11 +577,20 @@ get_new_file:
 	}
 	iter->num++;
 	if (!p) {
+		k5_mutex_unlock(&iter->file->data->lock);
 		iter->file = iter->file->next;
+		if (iter->file) {
+		    retval = k5_mutex_lock(&iter->file->data->lock);
+		    if (retval) {
+			profile_node_iterator_free(iter_p);
+			return retval;
+		    }
+		}
 		iter->node = 0;
 		skip_num = 0;
 		goto get_new_file;
 	}
+	k5_mutex_unlock(&iter->file->data->lock);
 	if ((iter->node = p->next) == NULL)
 		iter->file = iter->file->next;
 	if (ret_node)