From 085f1d8ec56b3fe81ef3a0994d156ddf83342f49 Mon Sep 17 00:00:00 2001 From: Ralph Castain Date: Thu, 7 Sep 2023 07:59:57 -0600 Subject: [PATCH] Do not follow links when doing "chown" There is a potential issue with allowing a "chown" operation to follow user-created links, so let's limit any use of that function to "lchown" - which directs the "chown" operation to NOT follow a link. Signed-off-by: Ralph Castain (cherry picked from commit ae62cdf67b19e80fd821420816f09bf0a56a8166) (cherry picked from commit da036933c2795c1f40d0835e15f17e204e4daf0f) Signed-off-by: Kamal Heib --- src/mca/common/dstore/dstore_base.c | 4 ++-- src/mca/common/dstore/dstore_segment.c | 4 ++-- src/mca/gds/ds12/gds_ds12_lock_fcntl.c | 2 +- src/mca/gds/ds12/gds_ds12_lock_pthread.c | 2 +- src/mca/ptl/usock/ptl_usock_component.c | 6 +++--- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/mca/common/dstore/dstore_base.c b/src/mca/common/dstore/dstore_base.c index 5568c9434778..68eeabdbc4d7 100644 --- a/src/mca/common/dstore/dstore_base.c +++ b/src/mca/common/dstore/dstore_base.c @@ -525,7 +525,7 @@ static int _esh_session_init(pmix_common_dstore_ctx_t *ds_ctx, size_t idx, ns_ma } } if (s->setjobuid > 0){ - if (0 > chown(s->nspace_path, (uid_t) s->jobuid, (gid_t) -1)){ + if (0 > lchown(s->nspace_path, (uid_t) s->jobuid, (gid_t) -1)){ rc = PMIX_ERROR; PMIX_ERROR_LOG(rc); return rc; @@ -1661,7 +1661,7 @@ pmix_common_dstore_ctx_t *pmix_common_dstor_init(const char *ds_name, pmix_info_ } } if (ds_ctx->setjobuid > 0) { - if (chown(ds_ctx->base_path, (uid_t) ds_ctx->jobuid, (gid_t) -1) < 0){ + if (lchown(ds_ctx->base_path, (uid_t) ds_ctx->jobuid, (gid_t) -1) < 0){ rc = PMIX_ERR_NO_PERMISSIONS; PMIX_ERROR_LOG(rc); goto err_exit; diff --git a/src/mca/common/dstore/dstore_segment.c b/src/mca/common/dstore/dstore_segment.c index a219bed9c0bf..4a7c55ea9c8f 100644 --- a/src/mca/common/dstore/dstore_segment.c +++ b/src/mca/common/dstore/dstore_segment.c @@ -109,7 +109,7 @@ PMIX_EXPORT pmix_dstore_seg_desc_t *pmix_common_dstor_create_new_lock_seg(const if (setuid > 0){ rc = PMIX_ERR_PERM; - if (0 > chown(file_name, (uid_t) uid, (gid_t) -1)){ + if (0 > lchown(file_name, (uid_t) uid, (gid_t) -1)){ PMIX_ERROR_LOG(rc); goto err_exit; } @@ -200,7 +200,7 @@ PMIX_EXPORT pmix_dstore_seg_desc_t *pmix_common_dstor_create_new_segment(pmix_ds if (setuid > 0){ rc = PMIX_ERR_PERM; - if (0 > chown(file_name, (uid_t) uid, (gid_t) -1)){ + if (0 > lchown(file_name, (uid_t) uid, (gid_t) -1)){ PMIX_ERROR_LOG(rc); goto err_exit; } diff --git a/src/mca/gds/ds12/gds_ds12_lock_fcntl.c b/src/mca/gds/ds12/gds_ds12_lock_fcntl.c index 759bf4093747..515b3298136f 100644 --- a/src/mca/gds/ds12/gds_ds12_lock_fcntl.c +++ b/src/mca/gds/ds12/gds_ds12_lock_fcntl.c @@ -127,7 +127,7 @@ pmix_status_t pmix_gds_ds12_lock_init(pmix_common_dstor_lock_ctx_t *ctx, const c } } if (0 != setuid) { - if (0 > chown(lock_ctx->lockfile, uid, (gid_t) -1)) { + if (0 > lchown(lock_ctx->lockfile, uid, (gid_t) -1)) { rc = PMIX_ERROR; PMIX_ERROR_LOG(rc); goto error; diff --git a/src/mca/gds/ds12/gds_ds12_lock_pthread.c b/src/mca/gds/ds12/gds_ds12_lock_pthread.c index 1c9e9b79bb3e..fe7e64be4194 100644 --- a/src/mca/gds/ds12/gds_ds12_lock_pthread.c +++ b/src/mca/gds/ds12/gds_ds12_lock_pthread.c @@ -113,7 +113,7 @@ pmix_status_t pmix_gds_ds12_lock_init(pmix_common_dstor_lock_ctx_t *ctx, const c } memset(lock_ctx->segment->seg_base_addr, 0, size); if (0 != setuid) { - if (0 > chown(lock_ctx->lockfile, (uid_t) uid, (gid_t) -1)){ + if (0 > lchown(lock_ctx->lockfile, (uid_t) uid, (gid_t) -1)){ rc = PMIX_ERROR; PMIX_ERROR_LOG(rc); goto error; diff --git a/src/mca/ptl/usock/ptl_usock_component.c b/src/mca/ptl/usock/ptl_usock_component.c index f65d49ffde79..a6c1fdb496b3 100644 --- a/src/mca/ptl/usock/ptl_usock_component.c +++ b/src/mca/ptl/usock/ptl_usock_component.c @@ -276,16 +276,16 @@ static pmix_status_t setup_listener(pmix_info_t info[], size_t ninfo, CLOSE_THE_SOCKET(lt->socket); goto sockerror; } - /* chown as required */ + /* lchown as required */ if (lt->owner_given) { - if (0 != chown(address->sun_path, lt->owner, -1)) { + if (0 != lchown(address->sun_path, lt->owner, -1)) { pmix_output(0, "CANNOT CHOWN socket %s: %s", address->sun_path, strerror (errno)); CLOSE_THE_SOCKET(lt->socket); goto sockerror; } } if (lt->group_given) { - if (0 != chown(address->sun_path, -1, lt->group)) { + if (0 != lchown(address->sun_path, -1, lt->group)) { pmix_output(0, "CANNOT CHOWN socket %s: %s", address->sun_path, strerror (errno)); CLOSE_THE_SOCKET(lt->socket); goto sockerror; -- 2.41.0