git: dae05d22d64e - stable/11 - pam_login_access: Fix negative entry matching logic

[Mark Johnston]

The branch stable/11 has been updated by markj:

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

commit dae05d22d64ea218abe5883be539c2b41c20b1fb
Author:     Mark Johnston <markj at FreeBSD.org>
AuthorDate: 2021-02-23 22:01:29 +0000
Commit:     Mark Johnston <markj at FreeBSD.org>
CommitDate: 2021-02-24 01:21:13 +0000

    pam_login_access: Fix negative entry matching logic
    
    PR:             252194
    Approved by:    so
    Security:       CVE-2020-25580
    Security:       FreeBSD-SA-21:03.pam_login_access
    
    (cherry picked from commit 6ab923cbca8759503a08683a5978b9ebf5efd607)
---
 lib/libpam/modules/pam_login_access/login_access.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/libpam/modules/pam_login_access/login_access.c b/lib/libpam/modules/pam_login_access/login_access.c
index 9496081d362e..719808858dac 100644
--- a/lib/libpam/modules/pam_login_access/login_access.c
+++ b/lib/libpam/modules/pam_login_access/login_access.c
@@ -137,10 +137,10 @@ list_match(char *list, const char *item,
     if (match != NO) {
 	while ((tok = strtok((char *) 0, listsep)) && strcmp(tok, "EXCEPT")) {
 	     /* VOID */ ;
-	    if (tok == NULL || list_match((char *) 0, item, match_fn,
-		login_access_opts) == NO) {
+	}
+	if (tok == NULL ||
+	    list_match((char *) 0, item, match_fn, login_access_opts) == NO) {
 		return (match);
-	    }
 	}
     }
     return (NO);