rpms/shadow-utils
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix static analyzer detected issues

Browse Source 
Resolves: RHEL-35383

Signed-off-by: Iker Pedrosa <ipedrosa@redhat.com>
This commit is contained in:
Iker Pedrosa 2024-06-18 11:56:02 +02:00
parent fd50fe1eda
commit 693d5061e5
3 changed files with 1573 additions and 155 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

302
shadow-4.15.0-audit-update.patch
View File

@ -1,6 +1,6 @@
diff -up shadow-4.15.0/lib/audit_help.c.audit-update shadow-4.15.0/lib/audit_help.c
--- shadow-4.15.0/lib/audit_help.c.audit-update 2024-03-01 02:50:52.000000000 +0100
+++ shadow-4.15.0/lib/audit_help.c 2024-03-11 10:56:20.233991612 +0100
diff -up shadow-4.15.1/lib/audit_help.c.audit-update shadow-4.15.1/lib/audit_help.c
--- shadow-4.15.1/lib/audit_help.c.audit-update 2024-03-01 02:50:52.000000000 +0100
+++ shadow-4.15.1/lib/audit_help.c 2024-05-20 11:52:05.639758532 +0200
@@ -48,7 +48,7 @@ void audit_help_open (void)
* This function will log a message to the audit system using a predefined
* message format. Parameter usage is as follows:
@ -50,9 +50,9 @@ diff -up shadow-4.15.0/lib/audit_help.c.audit-update shadow-4.15.0/lib/audit_hel
void audit_logger_message (const char *message, shadow_audit_result result)
{
if (audit_fd < 0) {
diff -up shadow-4.15.0/lib/cleanup_group.c.audit-update shadow-4.15.0/lib/cleanup_group.c
--- shadow-4.15.0/lib/cleanup_group.c.audit-update 2024-03-01 02:50:52.000000000 +0100
+++ shadow-4.15.0/lib/cleanup_group.c 2024-03-11 10:56:20.233991612 +0100
diff -up shadow-4.15.1/lib/cleanup_group.c.audit-update shadow-4.15.1/lib/cleanup_group.c
--- shadow-4.15.1/lib/cleanup_group.c.audit-update 2024-03-01 02:50:52.000000000 +0100
+++ shadow-4.15.1/lib/cleanup_group.c 2024-05-20 11:52:05.639758532 +0200
@@ -62,7 +62,7 @@ void cleanup_report_mod_group (void *cle
gr_dbname (),
info->action));
@ -131,9 +131,9 @@ diff -up shadow-4.15.0/lib/cleanup_group.c.audit-update shadow-4.15.0/lib/cleanu
SHADOW_AUDIT_FAILURE);
#endif
}
diff -up shadow-4.15.0/lib/cleanup_user.c.audit-update shadow-4.15.0/lib/cleanup_user.c
--- shadow-4.15.0/lib/cleanup_user.c.audit-update 2024-03-01 02:50:52.000000000 +0100
+++ shadow-4.15.0/lib/cleanup_user.c 2024-03-11 10:56:20.233991612 +0100
diff -up shadow-4.15.1/lib/cleanup_user.c.audit-update shadow-4.15.1/lib/cleanup_user.c
--- shadow-4.15.1/lib/cleanup_user.c.audit-update 2024-03-01 02:50:52.000000000 +0100
+++ shadow-4.15.1/lib/cleanup_user.c 2024-05-20 11:52:05.639758532 +0200
@@ -44,7 +44,7 @@ void cleanup_report_mod_passwd (void *cl
pw_dbname (),
info->action));
@ -181,9 +181,9 @@ diff -up shadow-4.15.0/lib/cleanup_user.c.audit-update shadow-4.15.0/lib/cleanup
SHADOW_AUDIT_FAILURE);
#endif
}
diff -up shadow-4.15.0/lib/prototypes.h.audit-update shadow-4.15.0/lib/prototypes.h
--- shadow-4.15.0/lib/prototypes.h.audit-update 2024-03-01 02:50:52.000000000 +0100
+++ shadow-4.15.0/lib/prototypes.h 2024-03-11 10:56:20.233991612 +0100
diff -up shadow-4.15.1/lib/prototypes.h.audit-update shadow-4.15.1/lib/prototypes.h
--- shadow-4.15.1/lib/prototypes.h.audit-update 2024-03-01 02:50:52.000000000 +0100
+++ shadow-4.15.1/lib/prototypes.h 2024-05-20 11:52:05.639758532 +0200
@@ -198,12 +198,21 @@ extern int audit_fd;
extern void audit_help_open (void);
/* Use AUDIT_NO_ID when a name is provided to audit_logger instead of an ID */
@ -206,9 +206,9 @@ diff -up shadow-4.15.0/lib/prototypes.h.audit-update shadow-4.15.0/lib/prototype
void audit_logger_message (const char *message, shadow_audit_result result);
#endif
diff -up shadow-4.15.0/src/chage.c.audit-update shadow-4.15.0/src/chage.c
--- shadow-4.15.0/src/chage.c.audit-update 2024-03-08 22:27:04.000000000 +0100
+++ shadow-4.15.0/src/chage.c 2024-03-11 10:56:20.234991618 +0100
diff -up shadow-4.15.1/src/chage.c.audit-update shadow-4.15.1/src/chage.c
--- shadow-4.15.1/src/chage.c.audit-update 2024-03-08 22:27:04.000000000 +0100
+++ shadow-4.15.1/src/chage.c 2024-05-20 11:52:05.639758532 +0200
@@ -110,8 +110,8 @@ fail_exit (int code)
#ifdef WITH_AUDIT
@ -287,9 +287,9 @@ diff -up shadow-4.15.0/src/chage.c.audit-update shadow-4.15.0/src/chage.c
user_name, user_uid, 1);
}
#endif
diff -up shadow-4.15.0/src/gpasswd.c.audit-update shadow-4.15.0/src/gpasswd.c
--- shadow-4.15.0/src/gpasswd.c.audit-update 2024-03-08 22:27:04.000000000 +0100
+++ shadow-4.15.0/src/gpasswd.c 2024-03-11 10:56:20.234991618 +0100
diff -up shadow-4.15.1/src/gpasswd.c.audit-update shadow-4.15.1/src/gpasswd.c
--- shadow-4.15.1/src/gpasswd.c.audit-update 2024-03-08 22:27:04.000000000 +0100
+++ shadow-4.15.1/src/gpasswd.c 2024-05-20 11:52:05.640758536 +0200
@@ -125,7 +125,7 @@ static void usage (int status)
(void) fputs (_(" -d, --delete USER remove USER from GROUP\n"), usageout);
(void) fputs (_(" -h, --help display this help message and exit\n"), usageout);
@ -514,9 +514,9 @@ diff -up shadow-4.15.0/src/gpasswd.c.audit-update shadow-4.15.0/src/gpasswd.c
SHADOW_AUDIT_SUCCESS);
#endif
}
diff -up shadow-4.15.0/src/groupadd.c.audit-update shadow-4.15.0/src/groupadd.c
--- shadow-4.15.0/src/groupadd.c.audit-update 2024-03-08 22:27:04.000000000 +0100
+++ shadow-4.15.0/src/groupadd.c 2024-03-11 10:59:11.522108956 +0100
diff -up shadow-4.15.1/src/groupadd.c.audit-update shadow-4.15.1/src/groupadd.c
--- shadow-4.15.1/src/groupadd.c.audit-update 2024-03-08 22:27:04.000000000 +0100
+++ shadow-4.15.1/src/groupadd.c 2024-05-20 11:52:05.640758536 +0200
@@ -115,6 +115,15 @@ usage (int status)
exit (status);
}
@ -690,9 +690,9 @@ diff -up shadow-4.15.0/src/groupadd.c.audit-update shadow-4.15.0/src/groupadd.c
}
}
diff -up shadow-4.15.0/src/groupdel.c.audit-update shadow-4.15.0/src/groupdel.c
--- shadow-4.15.0/src/groupdel.c.audit-update 2024-03-08 22:27:04.000000000 +0100
+++ shadow-4.15.0/src/groupdel.c 2024-03-11 11:14:20.572151046 +0100
diff -up shadow-4.15.1/src/groupdel.c.audit-update shadow-4.15.1/src/groupdel.c
--- shadow-4.15.1/src/groupdel.c.audit-update 2024-03-08 22:27:04.000000000 +0100
+++ shadow-4.15.1/src/groupdel.c 2024-05-20 11:52:05.640758536 +0200
@@ -87,6 +87,15 @@ usage (int status)
exit (status);
}
@ -860,9 +860,9 @@ diff -up shadow-4.15.0/src/groupdel.c.audit-update shadow-4.15.0/src/groupdel.c
}
#endif
diff -up shadow-4.15.0/src/groupmod.c.audit-update shadow-4.15.0/src/groupmod.c
--- shadow-4.15.0/src/groupmod.c.audit-update 2024-03-08 22:27:04.000000000 +0100
+++ shadow-4.15.0/src/groupmod.c 2024-03-11 10:56:20.234991618 +0100
diff -up shadow-4.15.1/src/groupmod.c.audit-update shadow-4.15.1/src/groupmod.c
--- shadow-4.15.1/src/groupmod.c.audit-update 2024-03-08 22:27:04.000000000 +0100
+++ shadow-4.15.1/src/groupmod.c 2024-05-20 11:52:05.640758536 +0200
@@ -474,7 +474,7 @@ static void close_files (void)
exit (E_GRP_UPDATE);
}
@ -908,9 +908,9 @@ diff -up shadow-4.15.0/src/groupmod.c.audit-update shadow-4.15.0/src/groupmod.c
group_name, AUDIT_NO_ID,
SHADOW_AUDIT_SUCCESS);
#endif
diff -up shadow-4.15.0/src/newgrp.c.audit-update shadow-4.15.0/src/newgrp.c
--- shadow-4.15.0/src/newgrp.c.audit-update 2024-03-08 22:27:04.000000000 +0100
+++ shadow-4.15.0/src/newgrp.c 2024-03-11 10:56:20.234991618 +0100
diff -up shadow-4.15.1/src/newgrp.c.audit-update shadow-4.15.1/src/newgrp.c
--- shadow-4.15.1/src/newgrp.c.audit-update 2024-03-08 22:27:04.000000000 +0100
+++ shadow-4.15.1/src/newgrp.c 2024-05-20 11:52:05.640758536 +0200
@@ -188,10 +188,10 @@ static void check_perms (const struct gr
if (grp->gr_passwd[0] == '\0' ||
strcmp (cpasswd, grp->gr_passwd) != 0) {
@ -1091,10 +1091,10 @@ diff -up shadow-4.15.0/src/newgrp.c.audit-update shadow-4.15.0/src/newgrp.c
}
#endif
exit (EXIT_FAILURE);
diff -up shadow-4.15.0/src/useradd.c.audit-update shadow-4.15.0/src/useradd.c
--- shadow-4.15.0/src/useradd.c.audit-update 2024-03-08 22:27:04.000000000 +0100
+++ shadow-4.15.0/src/useradd.c 2024-03-11 10:56:20.235991625 +0100
@@ -242,6 +242,8 @@ static void check_uid_range(int rflg, ui
diff -up shadow-4.15.1/src/useradd.c.audit-update shadow-4.15.1/src/useradd.c
--- shadow-4.15.1/src/useradd.c.audit-update 2024-05-20 11:52:05.635758519 +0200
+++ shadow-4.15.1/src/useradd.c 2024-05-20 11:52:05.640758536 +0200
@@ -245,6 +245,8 @@ static FILE *fmkstemp(char *template);
*/
static void fail_exit (int code)
{
@ -1103,7 +1103,7 @@ diff -up shadow-4.15.0/src/useradd.c.audit-update shadow-4.15.0/src/useradd.c
if (home_added && rmdir(prefix_user_home) != 0) {
fprintf(stderr,
_("%s: %s was created, but could not be removed\n"),
@@ -252,38 +254,22 @@ static void fail_exit (int code)
@@ -255,38 +257,22 @@ static void fail_exit (int code)
if (spw_locked && spw_unlock() == 0) {
fprintf(stderr, _("%s: failed to unlock %s\n"), Prog, spw_dbname());
SYSLOG((LOG_ERR, "failed to unlock %s", spw_dbname()));
@ -1142,7 +1142,7 @@ diff -up shadow-4.15.0/src/useradd.c.audit-update shadow-4.15.0/src/useradd.c
/* continue */
}
#endif
@@ -291,27 +277,23 @@ static void fail_exit (int code)
@@ -294,27 +280,23 @@ static void fail_exit (int code)
if (sub_uid_locked && sub_uid_unlock() == 0) {
fprintf(stderr, _("%s: failed to unlock %s\n"), Prog, sub_uid_dbname());
SYSLOG((LOG_ERR, "failed to unlock %s", sub_uid_dbname()));
@ -1177,7 +1177,7 @@ diff -up shadow-4.15.0/src/useradd.c.audit-update shadow-4.15.0/src/useradd.c
user_name, AUDIT_NO_ID, SHADOW_AUDIT_FAILURE);
#endif
SYSLOG((LOG_INFO, "failed adding user '%s', exit code: %d", user_name, code));
@@ -732,7 +714,7 @@ static int set_defaults (void)
@@ -727,7 +709,7 @@ static int set_defaults (void)
}
#ifdef WITH_AUDIT
audit_logger (AUDIT_USYS_CONFIG, Prog,
@ -1186,7 +1186,7 @@ diff -up shadow-4.15.0/src/useradd.c.audit-update shadow-4.15.0/src/useradd.c
NULL, AUDIT_NO_ID,
SHADOW_AUDIT_SUCCESS);
#endif
@@ -1060,12 +1042,6 @@ static void grp_update (void)
@@ -1056,12 +1038,6 @@ static void grp_update (void)
_("%s: Out of memory. Cannot update %s.\n"),
Prog, gr_dbname ());
SYSLOG ((LOG_ERR, "failed to prepare the new %s entry '%s'", gr_dbname (), user_name));
@ -1199,7 +1199,7 @@ diff -up shadow-4.15.0/src/useradd.c.audit-update shadow-4.15.0/src/useradd.c
fail_exit (E_GRP_UPDATE); /* XXX */
}
@@ -1079,18 +1055,12 @@ static void grp_update (void)
@@ -1075,18 +1051,12 @@ static void grp_update (void)
_("%s: failed to prepare the new %s entry '%s'\n"),
Prog, gr_dbname (), ngrp->gr_name);
SYSLOG ((LOG_ERR, "failed to prepare the new %s entry '%s'", gr_dbname (), user_name));
@ -1221,7 +1221,7 @@ diff -up shadow-4.15.0/src/useradd.c.audit-update shadow-4.15.0/src/useradd.c
SHADOW_AUDIT_SUCCESS);
#endif
SYSLOG ((LOG_INFO,
@@ -1135,12 +1105,6 @@ static void grp_update (void)
@@ -1131,12 +1101,6 @@ static void grp_update (void)
_("%s: Out of memory. Cannot update %s.\n"),
Prog, sgr_dbname ());
SYSLOG ((LOG_ERR, "failed to prepare the new %s entry '%s'", sgr_dbname (), user_name));
@ -1234,7 +1234,7 @@ diff -up shadow-4.15.0/src/useradd.c.audit-update shadow-4.15.0/src/useradd.c
fail_exit (E_GRP_UPDATE); /* XXX */
}
@@ -1154,18 +1118,13 @@ static void grp_update (void)
@@ -1150,18 +1114,13 @@ static void grp_update (void)
_("%s: failed to prepare the new %s entry '%s'\n"),
Prog, sgr_dbname (), nsgrp->sg_name);
SYSLOG ((LOG_ERR, "failed to prepare the new %s entry '%s'", sgr_dbname (), user_name));
@ -1257,7 +1257,7 @@ diff -up shadow-4.15.0/src/useradd.c.audit-update shadow-4.15.0/src/useradd.c
SHADOW_AUDIT_SUCCESS);
#endif
SYSLOG ((LOG_INFO,
@@ -1560,7 +1519,7 @@ static void process_flags (int argc, cha
@@ -1556,7 +1515,7 @@ static void process_flags (int argc, cha
Prog, user_name);
#ifdef WITH_AUDIT
audit_logger (AUDIT_ADD_USER, Prog,
@ -1266,7 +1266,7 @@ diff -up shadow-4.15.0/src/useradd.c.audit-update shadow-4.15.0/src/useradd.c
user_name, AUDIT_NO_ID,
SHADOW_AUDIT_FAILURE);
#endif
@@ -1660,7 +1619,7 @@ static void close_files (void)
@@ -1656,7 +1615,7 @@ static void close_files (void)
SYSLOG ((LOG_ERR, "failed to unlock %s", spw_dbname ()));
#ifdef WITH_AUDIT
audit_logger (AUDIT_ADD_USER, Prog,
@ -1275,7 +1275,7 @@ diff -up shadow-4.15.0/src/useradd.c.audit-update shadow-4.15.0/src/useradd.c
user_name, AUDIT_NO_ID,
SHADOW_AUDIT_FAILURE);
#endif
@@ -1673,7 +1632,7 @@ static void close_files (void)
@@ -1669,7 +1628,7 @@ static void close_files (void)
SYSLOG ((LOG_ERR, "failed to unlock %s", pw_dbname ()));
#ifdef WITH_AUDIT
audit_logger (AUDIT_ADD_USER, Prog,
@ -1284,7 +1284,7 @@ diff -up shadow-4.15.0/src/useradd.c.audit-update shadow-4.15.0/src/useradd.c
user_name, AUDIT_NO_ID,
SHADOW_AUDIT_FAILURE);
#endif
@@ -1690,7 +1649,7 @@ static void close_files (void)
@@ -1686,7 +1645,7 @@ static void close_files (void)
SYSLOG ((LOG_ERR, "failed to unlock %s", sub_uid_dbname ()));
#ifdef WITH_AUDIT
audit_logger (AUDIT_ADD_USER, Prog,
@ -1293,7 +1293,7 @@ diff -up shadow-4.15.0/src/useradd.c.audit-update shadow-4.15.0/src/useradd.c
user_name, AUDIT_NO_ID,
SHADOW_AUDIT_FAILURE);
#endif
@@ -1704,7 +1663,7 @@ static void close_files (void)
@@ -1700,7 +1659,7 @@ static void close_files (void)
SYSLOG ((LOG_ERR, "failed to unlock %s", sub_gid_dbname ()));
#ifdef WITH_AUDIT
audit_logger (AUDIT_ADD_USER, Prog,
@ -1302,7 +1302,7 @@ diff -up shadow-4.15.0/src/useradd.c.audit-update shadow-4.15.0/src/useradd.c
user_name, AUDIT_NO_ID,
SHADOW_AUDIT_FAILURE);
#endif
@@ -1967,7 +1926,7 @@ static void grp_add (void)
@@ -1963,7 +1922,7 @@ static void grp_add (void)
Prog, gr_dbname (), grp.gr_name);
#ifdef WITH_AUDIT
audit_logger (AUDIT_ADD_GROUP, Prog,
@ -1311,7 +1311,7 @@ diff -up shadow-4.15.0/src/useradd.c.audit-update shadow-4.15.0/src/useradd.c
grp.gr_name, AUDIT_NO_ID,
SHADOW_AUDIT_FAILURE);
#endif
@@ -1983,7 +1942,7 @@ static void grp_add (void)
@@ -1979,7 +1938,7 @@ static void grp_add (void)
Prog, sgr_dbname (), sgrp.sg_name);
#ifdef WITH_AUDIT
audit_logger (AUDIT_ADD_GROUP, Prog,
@ -1320,7 +1320,7 @@ diff -up shadow-4.15.0/src/useradd.c.audit-update shadow-4.15.0/src/useradd.c
grp.gr_name, AUDIT_NO_ID,
SHADOW_AUDIT_FAILURE);
#endif
@@ -1993,7 +1952,7 @@ static void grp_add (void)
@@ -1989,7 +1948,7 @@ static void grp_add (void)
SYSLOG ((LOG_INFO, "new group: name=%s, GID=%u", user_name, user_gid));
#ifdef WITH_AUDIT
audit_logger (AUDIT_ADD_GROUP, Prog,
@ -1329,7 +1329,7 @@ diff -up shadow-4.15.0/src/useradd.c.audit-update shadow-4.15.0/src/useradd.c
grp.gr_name, AUDIT_NO_ID,
SHADOW_AUDIT_SUCCESS);
#endif
@@ -2195,11 +2154,6 @@ static void usr_update (unsigned long su
@@ -2191,11 +2150,6 @@ static void usr_update (unsigned long su
fprintf (stderr,
_("%s: failed to prepare the new %s entry '%s'\n"),
Prog, spw_dbname (), spent.sp_namp);
@ -1341,7 +1341,7 @@ diff -up shadow-4.15.0/src/useradd.c.audit-update shadow-4.15.0/src/useradd.c
fail_exit (E_PW_UPDATE);
}
#ifdef ENABLE_SUBIDS
@@ -2226,7 +2180,7 @@ static void usr_update (unsigned long su
@@ -2222,7 +2176,7 @@ static void usr_update (unsigned long su
* and we can use the real ID thereafter.
*/
audit_logger (AUDIT_ADD_USER, Prog,
@ -1350,7 +1350,7 @@ diff -up shadow-4.15.0/src/useradd.c.audit-update shadow-4.15.0/src/useradd.c
user_name, AUDIT_NO_ID,
SHADOW_AUDIT_SUCCESS);
#endif
@@ -2321,10 +2275,6 @@ static void create_home (void)
@@ -2317,10 +2271,6 @@ static void create_home (void)
if (mkdir(path, 0) != 0) {
fprintf(stderr, _("%s: cannot create directory %s\n"),
Prog, path);
@ -1361,7 +1361,7 @@ diff -up shadow-4.15.0/src/useradd.c.audit-update shadow-4.15.0/src/useradd.c
fail_exit(E_HOMEDIR);
}
if (chown(path, 0, 0) < 0) {
@@ -2349,7 +2299,7 @@ static void create_home (void)
@@ -2345,7 +2295,7 @@ static void create_home (void)
}
home_added = true;
#ifdef WITH_AUDIT
@ -1370,7 +1370,7 @@ diff -up shadow-4.15.0/src/useradd.c.audit-update shadow-4.15.0/src/useradd.c
user_name, user_id, SHADOW_AUDIT_SUCCESS);
#endif
#ifdef WITH_SELINUX
@@ -2590,12 +2540,6 @@ int main (int argc, char **argv)
@@ -2586,12 +2536,6 @@ int main (int argc, char **argv)
*/
if (prefix_getpwnam (user_name) != NULL) { /* local, no need for xgetpwnam */
fprintf (stderr, _("%s: user '%s' already exists\n"), Prog, user_name);
@ -1383,7 +1383,7 @@ diff -up shadow-4.15.0/src/useradd.c.audit-update shadow-4.15.0/src/useradd.c
fail_exit (E_NAME_IN_USE);
}
@@ -2611,12 +2555,6 @@ int main (int argc, char **argv)
@@ -2607,12 +2551,6 @@ int main (int argc, char **argv)
fprintf (stderr,
_("%s: group %s exists - if you want to add this user to that group, use -g.\n"),
Prog, user_name);
@ -1396,7 +1396,7 @@ diff -up shadow-4.15.0/src/useradd.c.audit-update shadow-4.15.0/src/useradd.c
fail_exit (E_NAME_IN_USE);
}
}
@@ -2646,12 +2584,6 @@ int main (int argc, char **argv)
@@ -2642,12 +2580,6 @@ int main (int argc, char **argv)
fprintf (stderr,
_("%s: UID %lu is not unique\n"),
Prog, (unsigned long) user_id);
@ -1409,7 +1409,7 @@ diff -up shadow-4.15.0/src/useradd.c.audit-update shadow-4.15.0/src/useradd.c
fail_exit (E_UID_IN_USE);
}
}
@@ -2726,9 +2658,9 @@ int main (int argc, char **argv)
@@ -2722,9 +2654,9 @@ int main (int argc, char **argv)
_("%s: warning: the user name %s to %s SELinux user mapping failed.\n"),
Prog, user_name, user_selinux);
#ifdef WITH_AUDIT
@ -1422,9 +1422,9 @@ diff -up shadow-4.15.0/src/useradd.c.audit-update shadow-4.15.0/src/useradd.c
#endif /* WITH_AUDIT */
fail_exit (E_SE_UPDATE);
}
diff -up shadow-4.15.0/src/userdel.c.audit-update shadow-4.15.0/src/userdel.c
--- shadow-4.15.0/src/userdel.c.audit-update 2024-03-08 22:27:04.000000000 +0100
+++ shadow-4.15.0/src/userdel.c 2024-03-11 10:56:20.235991625 +0100
diff -up shadow-4.15.1/src/userdel.c.audit-update shadow-4.15.1/src/userdel.c
--- shadow-4.15.1/src/userdel.c.audit-update 2024-03-08 22:27:04.000000000 +0100
+++ shadow-4.15.1/src/userdel.c 2024-05-20 11:52:05.641758539 +0200
@@ -206,9 +206,9 @@ static void update_groups (void)
* Update the DBM group file with the new entry as well.
*/
@ -1740,10 +1740,10 @@ diff -up shadow-4.15.0/src/userdel.c.audit-update shadow-4.15.0/src/userdel.c
user_name, user_id, SHADOW_AUDIT_FAILURE);
#endif /* WITH_AUDIT */
fail_exit (E_SE_UPDATE);
diff -up shadow-4.15.0/src/usermod.c.audit-update shadow-4.15.0/src/usermod.c
--- shadow-4.15.0/src/usermod.c.audit-update 2024-03-08 22:27:04.000000000 +0100
+++ shadow-4.15.0/src/usermod.c 2024-03-11 10:56:20.235991625 +0100
@@ -438,7 +438,7 @@ static char *new_pw_passwd (char *pw_pas
diff -up shadow-4.15.1/src/usermod.c.audit-update shadow-4.15.1/src/usermod.c
--- shadow-4.15.1/src/usermod.c.audit-update 2024-05-20 11:52:05.638758529 +0200
+++ shadow-4.15.1/src/usermod.c 2024-05-20 11:56:51.962509443 +0200
@@ -440,7 +440,7 @@ static char *new_pw_passwd (char *pw_pas
#ifdef WITH_AUDIT
audit_logger (AUDIT_USER_CHAUTHTOK, Prog,
@ -1752,7 +1752,7 @@ diff -up shadow-4.15.0/src/usermod.c.audit-update shadow-4.15.0/src/usermod.c
#endif
SYSLOG ((LOG_INFO, "lock user '%s' password", user_newname));
strcpy (buf, "!");
@@ -455,14 +455,14 @@ static char *new_pw_passwd (char *pw_pas
@@ -457,14 +457,14 @@ static char *new_pw_passwd (char *pw_pas
#ifdef WITH_AUDIT
audit_logger (AUDIT_USER_CHAUTHTOK, Prog,
@ -1769,7 +1769,7 @@ diff -up shadow-4.15.0/src/usermod.c.audit-update shadow-4.15.0/src/usermod.c
#endif
SYSLOG ((LOG_INFO, "change user '%s' password", user_newname));
pw_pass = xstrdup (user_pass);
@@ -490,8 +490,8 @@ static void new_pwent (struct passwd *pw
@@ -492,8 +492,8 @@ static void new_pwent (struct passwd *pw
fail_exit (E_NAME_IN_USE);
}
#ifdef WITH_AUDIT
@ -1780,7 +1780,7 @@ diff -up shadow-4.15.0/src/usermod.c.audit-update shadow-4.15.0/src/usermod.c
#endif
SYSLOG ((LOG_INFO,
"change user name '%s' to '%s'",
@@ -510,8 +510,8 @@ static void new_pwent (struct passwd *pw
@@ -512,8 +512,8 @@ static void new_pwent (struct passwd *pw
if (uflg) {
#ifdef WITH_AUDIT
@ -1791,7 +1791,7 @@ diff -up shadow-4.15.0/src/usermod.c.audit-update shadow-4.15.0/src/usermod.c
#endif
SYSLOG ((LOG_INFO,
"change user '%s' UID from '%d' to '%d'",
@@ -520,8 +520,8 @@ static void new_pwent (struct passwd *pw
@@ -522,8 +522,8 @@ static void new_pwent (struct passwd *pw
}
if (gflg) {
#ifdef WITH_AUDIT
@ -1802,7 +1802,7 @@ diff -up shadow-4.15.0/src/usermod.c.audit-update shadow-4.15.0/src/usermod.c
user_newname, user_newid, 1);
#endif
SYSLOG ((LOG_INFO,
@@ -531,16 +531,16 @@ static void new_pwent (struct passwd *pw
@@ -533,16 +533,16 @@ static void new_pwent (struct passwd *pw
}
if (cflg) {
#ifdef WITH_AUDIT
@ -1823,7 +1823,7 @@ diff -up shadow-4.15.0/src/usermod.c.audit-update shadow-4.15.0/src/usermod.c
user_newname, user_newid, 1);
#endif
SYSLOG ((LOG_INFO,
@@ -556,8 +556,8 @@ static void new_pwent (struct passwd *pw
@@ -558,8 +558,8 @@ static void new_pwent (struct passwd *pw
}
if (sflg) {
#ifdef WITH_AUDIT
@ -1834,7 +1834,7 @@ diff -up shadow-4.15.0/src/usermod.c.audit-update shadow-4.15.0/src/usermod.c
user_newname, user_newid, 1);
#endif
SYSLOG ((LOG_INFO,
@@ -587,8 +587,8 @@ static void new_spent (struct spwd *spen
@@ -589,8 +589,8 @@ static void new_spent (struct spwd *spen
if (fflg) {
#ifdef WITH_AUDIT
@ -1845,7 +1845,7 @@ diff -up shadow-4.15.0/src/usermod.c.audit-update shadow-4.15.0/src/usermod.c
user_newname, user_newid, 1);
#endif
SYSLOG ((LOG_INFO,
@@ -602,8 +602,8 @@ static void new_spent (struct spwd *spen
@@ -604,8 +604,8 @@ static void new_spent (struct spwd *spen
date_to_str (sizeof(new_exp), new_exp, user_newexpire * DAY);
date_to_str (sizeof(old_exp), old_exp, user_expire * DAY);
#ifdef WITH_AUDIT
@ -1856,7 +1856,7 @@ diff -up shadow-4.15.0/src/usermod.c.audit-update shadow-4.15.0/src/usermod.c
user_newname, user_newid, 1);
#endif
SYSLOG ((LOG_INFO,
@@ -688,9 +688,9 @@ fail_exit (int code)
@@ -690,9 +690,9 @@ fail_exit (int code)
#endif /* ENABLE_SUBIDS */
#ifdef WITH_AUDIT
@ -1869,109 +1869,109 @@ diff -up shadow-4.15.0/src/usermod.c.audit-update shadow-4.15.0/src/usermod.c
#endif
exit (code);
}
@@ -752,9 +752,12 @@ static void update_group (void)
user_newname);
changed = true;
#ifdef WITH_AUDIT
- audit_logger (AUDIT_USER_CHAUTHTOK, Prog,
- "changing group member",
- user_newname, AUDIT_NO_ID, 1);
+ audit_logger_with_group (
+ AUDIT_USER_MGMT, Prog,
+ "update-member-in-group",
+ user_newname, AUDIT_NO_ID,
+ ngrp->gr_name,
+ SHADOW_AUDIT_SUCCESS);
#endif
SYSLOG ((LOG_INFO,
"change '%s' to '%s' in group '%s'",
@@ -768,9 +771,11 @@ static void update_group (void)
ngrp->gr_mem = del_list (ngrp->gr_mem, user_name);
@@ -762,9 +762,12 @@ update_group(const struct group *grp)
user_newname);
changed = true;
#ifdef WITH_AUDIT
- audit_logger (AUDIT_USER_CHAUTHTOK, Prog,
- "removing group member",
- user_name, AUDIT_NO_ID, 1);
+ audit_logger_with_group (AUDIT_USER_MGMT, Prog,
+ "delete-user-from-group",
+ user_name, AUDIT_NO_ID,
- "changing group member",
- user_newname, AUDIT_NO_ID, 1);
+ audit_logger_with_group (
+ AUDIT_USER_MGMT, Prog,
+ "update-member-in-group",
+ user_newname, AUDIT_NO_ID,
+ ngrp->gr_name,
+ SHADOW_AUDIT_SUCCESS);
#endif
SYSLOG ((LOG_INFO,
"delete '%s' from group '%s'",
@@ -783,9 +788,11 @@ static void update_group (void)
ngrp->gr_mem = add_list (ngrp->gr_mem, user_newname);
"change '%s' to '%s' in group '%s'",
@@ -778,9 +781,11 @@ update_group(const struct group *grp)
ngrp->gr_mem = del_list (ngrp->gr_mem, user_name);
changed = true;
#ifdef WITH_AUDIT
- audit_logger (AUDIT_USER_CHAUTHTOK, Prog,
- "adding user to group",
- user_name, AUDIT_NO_ID, 1);
- "removing group member",
- user_name, AUDIT_NO_ID, 1);
+ audit_logger_with_group (AUDIT_USER_MGMT, Prog,
+ "add-user-to-group",
+ "delete-user-from-group",
+ user_name, AUDIT_NO_ID,
+ ngrp->gr_name,
+ SHADOW_AUDIT_SUCCESS);
#endif
SYSLOG ((LOG_INFO, "add '%s' to group '%s'",
user_newname, ngrp->gr_name));
@@ -870,9 +877,10 @@ static void update_gshadow (void)
nsgrp->sg_adm = add_list (nsgrp->sg_adm, user_newname);
changed = true;
#ifdef WITH_AUDIT
- audit_logger (AUDIT_USER_CHAUTHTOK, Prog,
- "changing admin name in shadow group",
- user_name, AUDIT_NO_ID, 1);
+ audit_logger_with_group (AUDIT_GRP_MGMT, Prog,
+ "update-admin-name-in-shadow-group",
+ user_name, AUDIT_NO_ID, nsgrp->sg_name,
+ SHADOW_AUDIT_SUCCESS);
#endif
SYSLOG ((LOG_INFO,
"change admin '%s' to '%s' in shadow group '%s'",
@@ -892,9 +900,10 @@ static void update_gshadow (void)
user_newname);
changed = true;
"delete '%s' from group '%s'",
@@ -793,9 +798,11 @@ update_group(const struct group *grp)
ngrp->gr_mem = add_list (ngrp->gr_mem, user_newname);
changed = true;
#ifdef WITH_AUDIT
- audit_logger (AUDIT_USER_CHAUTHTOK, Prog,
- "changing member in shadow group",
- user_name, AUDIT_NO_ID, 1);
+ audit_logger_with_group (AUDIT_USER_MGMT, Prog,
+ "update-member-in-shadow-group",
+ user_name, AUDIT_NO_ID,
+ nsgrp->sg_name, 1);
- audit_logger (AUDIT_USER_CHAUTHTOK, Prog,
- "adding user to group",
- user_name, AUDIT_NO_ID, 1);
+ audit_logger_with_group (AUDIT_USER_MGMT, Prog,
+ "add-user-to-group",
+ user_name, AUDIT_NO_ID,
+ ngrp->gr_name,
+ SHADOW_AUDIT_SUCCESS);
#endif
SYSLOG ((LOG_INFO,
"change '%s' to '%s' in shadow group '%s'",
@@ -908,9 +917,10 @@ static void update_gshadow (void)
nsgrp->sg_mem = del_list (nsgrp->sg_mem, user_name);
SYSLOG ((LOG_INFO, "add '%s' to group '%s'",
user_newname, ngrp->gr_name));
@@ -888,9 +895,10 @@ update_gshadow(const struct sgrp *sgrp)
nsgrp->sg_adm = add_list (nsgrp->sg_adm, user_newname);
changed = true;
#ifdef WITH_AUDIT
- audit_logger (AUDIT_USER_CHAUTHTOK, Prog,
- "changing admin name in shadow group",
- user_name, AUDIT_NO_ID, 1);
+ audit_logger_with_group (AUDIT_GRP_MGMT, Prog,
+ "update-admin-name-in-shadow-group",
+ user_name, AUDIT_NO_ID, nsgrp->sg_name,
+ SHADOW_AUDIT_SUCCESS);
#endif
SYSLOG ((LOG_INFO,
"change admin '%s' to '%s' in shadow group '%s'",
@@ -910,9 +918,10 @@ update_gshadow(const struct sgrp *sgrp)
user_newname);
changed = true;
#ifdef WITH_AUDIT
- audit_logger (AUDIT_USER_CHAUTHTOK, Prog,
- "removing user from shadow group",
- user_name, AUDIT_NO_ID, 1);
- "changing member in shadow group",
- user_name, AUDIT_NO_ID, 1);
+ audit_logger_with_group (AUDIT_USER_MGMT, Prog,
+ "delete-user-from-shadow-group",
+ "update-member-in-shadow-group",
+ user_name, AUDIT_NO_ID,
+ nsgrp->sg_name, 1);
#endif
SYSLOG ((LOG_INFO,
"delete '%s' from shadow group '%s'",
@@ -923,9 +933,10 @@ static void update_gshadow (void)
nsgrp->sg_mem = add_list (nsgrp->sg_mem, user_newname);
"change '%s' to '%s' in shadow group '%s'",
@@ -926,9 +935,10 @@ update_gshadow(const struct sgrp *sgrp)
nsgrp->sg_mem = del_list (nsgrp->sg_mem, user_name);
changed = true;
#ifdef WITH_AUDIT
- audit_logger (AUDIT_USER_CHAUTHTOK, Prog,
- "adding user to shadow group",
- user_newname, AUDIT_NO_ID, 1);
- "removing user from shadow group",
- user_name, AUDIT_NO_ID, 1);
+ audit_logger_with_group (AUDIT_USER_MGMT, Prog,
+ "add-user-to-shadow-group",
+ user_newname, AUDIT_NO_ID,
+ "delete-user-from-shadow-group",
+ user_name, AUDIT_NO_ID,
+ nsgrp->sg_name, 1);
#endif
SYSLOG ((LOG_INFO, "add '%s' to shadow group '%s'",
user_newname, nsgrp->sg_name));
@@ -1836,8 +1847,8 @@ static void move_home (void)
SYSLOG ((LOG_INFO,
"delete '%s' from shadow group '%s'",
@@ -941,9 +951,10 @@ update_gshadow(const struct sgrp *sgrp)
nsgrp->sg_mem = add_list (nsgrp->sg_mem, user_newname);
changed = true;
#ifdef WITH_AUDIT
- audit_logger (AUDIT_USER_CHAUTHTOK, Prog,
- "adding user to shadow group",
- user_newname, AUDIT_NO_ID, 1);
+ audit_logger_with_group (AUDIT_USER_MGMT, Prog,
+ "add-user-to-shadow-group",
+ user_newname, AUDIT_NO_ID,
+ nsgrp->sg_name, 1);
#endif
SYSLOG ((LOG_INFO, "add '%s' to shadow group '%s'",
user_newname, nsgrp->sg_name));
@@ -1852,8 +1863,8 @@ static void move_home (void)
#ifdef WITH_AUDIT
if (uflg || gflg) {
@ -1982,7 +1982,7 @@ diff -up shadow-4.15.0/src/usermod.c.audit-update shadow-4.15.0/src/usermod.c
user_newname, user_newid, 1);
}
#endif
@@ -1855,8 +1866,8 @@ static void move_home (void)
@@ -1871,8 +1882,8 @@ static void move_home (void)
fail_exit (E_HOMEDIR);
}
#ifdef WITH_AUDIT
@ -1993,7 +1993,7 @@ diff -up shadow-4.15.0/src/usermod.c.audit-update shadow-4.15.0/src/usermod.c
user_newname, user_newid, 1);
#endif
return;
@@ -1883,9 +1894,9 @@ static void move_home (void)
@@ -1899,9 +1910,9 @@ static void move_home (void)
Prog, prefix_user_home);
}
#ifdef WITH_AUDIT
@ -2005,7 +2005,7 @@ diff -up shadow-4.15.0/src/usermod.c.audit-update shadow-4.15.0/src/usermod.c
user_newname,
user_newid,
1);
@@ -2109,8 +2120,8 @@ static void move_mailbox (void)
@@ -2125,8 +2136,8 @@ static void move_mailbox (void)
}
#ifdef WITH_AUDIT
else {
@ -2016,7 +2016,7 @@ diff -up shadow-4.15.0/src/usermod.c.audit-update shadow-4.15.0/src/usermod.c
user_newname, user_newid, 1);
}
#endif
@@ -2133,8 +2144,8 @@ static void move_mailbox (void)
@@ -2149,8 +2160,8 @@ static void move_mailbox (void)
}
#ifdef WITH_AUDIT
else {
@ -2027,7 +2027,7 @@ diff -up shadow-4.15.0/src/usermod.c.audit-update shadow-4.15.0/src/usermod.c
user_newname, user_newid, 1);
}
@@ -2331,8 +2342,8 @@ int main (int argc, char **argv)
@@ -2347,8 +2358,8 @@ int main (int argc, char **argv)
_("%s: warning: the user name %s to %s SELinux user mapping failed.\n"),
Prog, user_name, user_selinux);
#ifdef WITH_AUDIT
@ -2038,7 +2038,7 @@ diff -up shadow-4.15.0/src/usermod.c.audit-update shadow-4.15.0/src/usermod.c
user_name, user_id,
SHADOW_AUDIT_FAILURE);
#endif /* WITH_AUDIT */
@@ -2344,8 +2355,8 @@ int main (int argc, char **argv)
@@ -2360,8 +2371,8 @@ int main (int argc, char **argv)
_("%s: warning: the user name %s to SELinux user mapping removal failed.\n"),
Prog, user_name);
#ifdef WITH_AUDIT
@ -2049,7 +2049,7 @@ diff -up shadow-4.15.0/src/usermod.c.audit-update shadow-4.15.0/src/usermod.c
user_name, user_id,
SHADOW_AUDIT_FAILURE);
#endif /* WITH_AUDIT */
@@ -2388,8 +2399,8 @@ int main (int argc, char **argv)
@@ -2404,8 +2415,8 @@ int main (int argc, char **argv)
*/
#ifdef WITH_AUDIT
if (uflg || gflg) {

1413
shadow-4.15.0-sast-fixes.patch Normal file
View File

File diff suppressed because it is too large Load Diff

13
shadow-utils.spec
View File

@ -1,7 +1,7 @@
Summary: Utilities for managing accounts and shadow password files
Name: shadow-utils
Version: 4.15.0
Release: 1%{?dist}
Release: 2%{?dist}
Epoch: 2
License: BSD-3-Clause AND GPL-2.0-or-later
URL: https://github.com/shadow-maint/shadow
@ -22,12 +22,14 @@ Source7: passwd.pamd
Patch0: shadow-4.15.0-manfix.patch
# Date parsing improvement - could be upstreamed
Patch1: shadow-4.15.0-date-parsing.patch
# https://github.com/shadow-maint/shadow/commit/d8e6a8b99b4d844328d875287babf6e13860d464
Patch2: shadow-4.15.0-sast-fixes.patch
# Audit message changes - partially upstreamed
Patch2: shadow-4.15.0-audit-update.patch
Patch3: shadow-4.15.0-audit-update.patch
# Probably non-upstreamable
Patch3: shadow-4.15.0-account-tools-setuid.patch
Patch4: shadow-4.15.0-account-tools-setuid.patch
# https://github.com/shadow-maint/shadow/commit/ead55e9ba8958504e23e29545f90c4dd925c7462
Patch4: shadow-4.15.0-getdef-spurious-error.patch
Patch5: shadow-4.15.0-getdef-spurious-error.patch
### Dependencies ###
Requires: audit-libs >= 1.6.5
@ -275,6 +277,9 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/libsubid.a
%{_libdir}/libsubid.so
%changelog
* Tue Jun 18 2024 Iker Pedrosa <ipedrosa@redhat.com> - 2:4.15.0-2
- Fix static analyzer detected issues. Resolves: RHEL-35383
* Wed Apr 3 2024 Iker Pedrosa <ipedrosa@redhat.com> - 2:4.15.0-1
- Rebase to version 4.15.0
- getdef: avoid spurious error messages about unknown configuration options