3 files changed, 16 insertions, 11 deletions

diff --git a/src/lib/ssm/pool.c b/src/lib/ssm/pool.c
index 97313e7d..6829b217 100644
--- a/src/lib/ssm/pool.c
+++ b/src/lib/ssm/pool.c
@@ -107,6 +107,8 @@ static const struct ssm_size_class_cfg ssm_pup_cfg[SSM_POOL_MAX_CLASSES] = {
                                                : SSM_PUP_FILE_SIZE)
 #define GET_POOL_CFG(uid)        (IS_GSPP(uid) ? ssm_gspp_cfg : ssm_pup_cfg)
 
+#define NEEDS_CHOWN(uid, gid)    ((uid) != geteuid() || (gid) != getegid())
+
 struct ssm_pool {
         uint8_t *               shm_base;   /* start of blocks           */
         struct _ssm_pool_hdr *  hdr;        /* shared memory header      */
@@ -506,14 +508,12 @@ void ssm_pool_destroy(struct ssm_pool * pool)
 
         if (getpid() != pool->hdr->pid && kill(pool->hdr->pid, 0) == 0) {
                 ssm_pool_close(pool);
-                free(pool);
                 return;
         }
 
         fn = pool_filename(pool->uid);
         if (fn == NULL) {
                 ssm_pool_close(pool);
-                free(pool);
                 return;
         }
 
@@ -550,7 +550,7 @@ static struct ssm_pool * __pool_create(const char * name,
         if (flags & O_CREAT) {
                 if (ftruncate(fd, (off_t) file_size) < 0)
                         goto fail_truncate;
-                if (uid != geteuid() && fchown(fd, uid, gid) < 0)
+                if (NEEDS_CHOWN(uid, gid) && fchown(fd, uid, gid) < 0)
                         goto fail_truncate;
         }
 
@@ -746,7 +746,7 @@ ssize_t ssm_pool_read(uint8_t **        dst,
 }
 
 struct ssm_pk_buff * ssm_pool_get(struct ssm_pool * pool,
-                                     size_t            off)
+                                  size_t            off)
 {
         struct ssm_pk_buff * blk;
 
@@ -825,7 +825,7 @@ int ssm_pool_remove(struct ssm_pool * pool,
         return 0;
 }
 
-size_t ssm_pk_buff_get_idx(struct ssm_pk_buff * spb)
+size_t ssm_pk_buff_get_off(struct ssm_pk_buff * spb)
 {
         assert(spb != NULL);
 
diff --git a/src/lib/ssm/rbuff.c b/src/lib/ssm/rbuff.c
index e4558c31..77e23010 100644
--- a/src/lib/ssm/rbuff.c
+++ b/src/lib/ssm/rbuff.c
@@ -232,7 +232,7 @@ void ssm_rbuff_close(struct ssm_rbuff * rb)
 }
 
 int ssm_rbuff_write(struct ssm_rbuff * rb,
-                    size_t             idx)
+                    size_t             off)
 {
         size_t acl;
         bool   was_empty;
@@ -261,7 +261,7 @@ int ssm_rbuff_write(struct ssm_rbuff * rb,
 
         was_empty = IS_EMPTY(rb);
 
-        HEAD(rb) = (ssize_t) idx;
+        HEAD(rb) = (ssize_t) off;
         ADVANCE_HEAD(rb);
 
         if (was_empty)
@@ -278,7 +278,7 @@ int ssm_rbuff_write(struct ssm_rbuff * rb,
 }
 
 int ssm_rbuff_write_b(struct ssm_rbuff *      rb,
-                      size_t                  idx,
+                      size_t                  off,
                       const struct timespec * abstime)
 {
         size_t acl;
@@ -316,7 +316,7 @@ int ssm_rbuff_write_b(struct ssm_rbuff *      rb,
 
         if (ret != -ETIMEDOUT && ret != -EFLOWDOWN) {
                 was_empty = IS_EMPTY(rb);
-                HEAD(rb) = (ssize_t) idx;
+                HEAD(rb) = (ssize_t) off;
                 ADVANCE_HEAD(rb);
                 if (was_empty)
                         pthread_cond_broadcast(rb->add);
diff --git a/src/lib/ssm/tests/pool_sharding_test.c b/src/lib/ssm/tests/pool_sharding_test.c
index 4ecd2b9c..f2810c53 100644
--- a/src/lib/ssm/tests/pool_sharding_test.c
+++ b/src/lib/ssm/tests/pool_sharding_test.c
@@ -242,6 +242,8 @@ static int test_fallback_stealing(void)
         ptrs = malloc(total_blocks * sizeof(uint8_t *));
         if (spbs == NULL || ptrs == NULL) {
                 printf("Failed to allocate test arrays.\n");
+                free(spbs);
+                free(ptrs);
                 goto fail_pool;
         }
 
@@ -259,7 +261,7 @@ static int test_fallback_stealing(void)
 
         /* Free them all - they go to local_shard */
         for (i = 0; i < total_blocks / 2; i++) {
-                size_t off = ssm_pk_buff_get_idx(spbs[i]);
+                size_t off = ssm_pk_buff_get_off(spbs[i]);
                 if (ssm_pool_remove(pool, off) != 0) {
                         printf("Remove %zu failed.\n", i);
                         free(spbs);
@@ -297,7 +299,7 @@ static int test_fallback_stealing(void)
         /* Now all allocated blocks are in use again */
         /* Cleanup - free all allocated blocks */
         for (i = 0; i < total_blocks / 2; i++) {
-                size_t off = ssm_pk_buff_get_idx(spbs[i]);
+                size_t off = ssm_pk_buff_get_off(spbs[i]);
                 ssm_pool_remove(pool, off);
         }
 
@@ -326,6 +328,9 @@ static int test_multiprocess_sharding(void)
 
         TEST_START();
 
+        for (i = 0; i < SSM_POOL_SHARDS; i++)
+                children[i] = -1;
+
         pool = ssm_pool_create(getuid(), getgid());
         if (pool == NULL) {
                 printf("Failed to create pool.\n");