The branch main has been updated by emaste:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=892654fe9b5a9115815c30a423b8db47185aebbd

commit 892654fe9b5a9115815c30a423b8db47185aebbd
Author:     Olivier Certner <olce.free...@certner.fr>
AuthorDate: 2023-05-30 16:35:08 +0000
Commit:     Ed Maste <ema...@freebsd.org>
CommitDate: 2023-10-10 01:47:10 +0000

    setusercontext(): Apply personal settings only on matching effective UID
    
    Commit 35305a8dc114 (r211393) added a check on whether 'uid' was equal
    to getuid() before calling setlogincontext().  Doing so still allows
    a setuid program to apply resource limits and priorities specified in
    a user-controlled configuration file ('~/.login_conf') where
    a non-setuid program could not.  Plug the hole by checking instead that
    the process' effective UID is the target one (which is likely what was
    meant in the initial commit).
    
    PR:                     271750
    Reviewed by:            kib, des
    MFC after:              2 weeks
    Sponsored by:           Kumacom SAS
    Differential Revision:  https://reviews.freebsd.org/D40351
---
 lib/libutil/login_class.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/libutil/login_class.c b/lib/libutil/login_class.c
index 90a3ec5d106a..1036e9f9208c 100644
--- a/lib/libutil/login_class.c
+++ b/lib/libutil/login_class.c
@@ -546,7 +546,7 @@ setusercontext(login_cap_t *lc, const struct passwd *pwd, 
uid_t uid, unsigned in
     /*
      * Now, we repeat some of the above for the user's private entries
      */
-    if (getuid() == uid && (lc = login_getuserclass(pwd)) != NULL) {
+    if (geteuid() == uid && (lc = login_getuserclass(pwd)) != NULL) {
        mymask = setlogincontext(lc, pwd, mymask, flags);
        login_close(lc);
     }

Reply via email to