Compare commits
2 Commits
master
...
debian/str
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
aba0cde8f0 | ||
|
|
abc4a04e95 |
28
debian/changelog
vendored
28
debian/changelog
vendored
@@ -1,3 +1,31 @@
|
|||||||
|
shadow (1:4.4-4.1+deb9u2) stretch-security; urgency=medium
|
||||||
|
|
||||||
|
* Non-maintainer upload by the ELTS Team.
|
||||||
|
* CVE-2018-7169: unprivileged user can drop supplementary groups
|
||||||
|
* CVE-2023-4641: gpasswd password leak
|
||||||
|
* CVE-2023-29383: chfn missing control character check
|
||||||
|
|
||||||
|
-- Adrian Bunk <bunk@debian.org> Sat, 26 Oct 2024 18:55:08 +0300
|
||||||
|
|
||||||
|
shadow (1:4.4-4.1+deb9u1) stretch-security; urgency=high
|
||||||
|
|
||||||
|
* Non-maintainer upload by the LTS Security Team.
|
||||||
|
* CVE-2017-20002: revert adding pts/0 and pts/1 to securetty.
|
||||||
|
Adding pts/* defeats the purpose of securetty. Let containers add it
|
||||||
|
if needed as described in #830255.
|
||||||
|
(cherry-picked from 1:4.5-1)
|
||||||
|
See also #877374 (previous proposed update) and #914957
|
||||||
|
(/etc/securetty will be dropped in bullseye).
|
||||||
|
* CVE-2017-12424: the newusers tool could be made to manipulate internal
|
||||||
|
data structures in ways unintended by the authors. Malformed input may
|
||||||
|
lead to crashes (with a buffer overflow or other memory corruption) or
|
||||||
|
other unspecified behaviors. This crosses a privilege boundary in, for
|
||||||
|
example, certain web-hosting environments in which a Control Panel
|
||||||
|
allows an unprivileged user account to create subaccounts.
|
||||||
|
(Closes: #756630)
|
||||||
|
|
||||||
|
-- Sylvain Beucler <beuc@debian.org> Wed, 17 Mar 2021 10:27:01 +0100
|
||||||
|
|
||||||
shadow (1:4.4-4.1) unstable; urgency=high
|
shadow (1:4.4-4.1) unstable; urgency=high
|
||||||
|
|
||||||
* Non-maintainer upload.
|
* Non-maintainer upload.
|
||||||
|
|||||||
183
debian/patches/0001-newgidmap-enforce-setgroups-deny-if-self-mapping-a-g.patch
vendored
Normal file
183
debian/patches/0001-newgidmap-enforce-setgroups-deny-if-self-mapping-a-g.patch
vendored
Normal file
@@ -0,0 +1,183 @@
|
|||||||
|
From f46921b828f06435f8ec1f4ce51f8f622c97f326 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Aleksa Sarai <asarai@suse.de>
|
||||||
|
Date: Thu, 15 Feb 2018 23:49:40 +1100
|
||||||
|
Subject: newgidmap: enforce setgroups=deny if self-mapping a group
|
||||||
|
|
||||||
|
This is necessary to match the kernel-side policy of "self-mapping in a
|
||||||
|
user namespace is fine, but you cannot drop groups" -- a policy that was
|
||||||
|
created in order to stop user namespaces from allowing trivial privilege
|
||||||
|
escalation by dropping supplementary groups that were "blacklisted" from
|
||||||
|
certain paths.
|
||||||
|
|
||||||
|
This is the simplest fix for the underlying issue, and effectively makes
|
||||||
|
it so that unless a user has a valid mapping set in /etc/subgid (which
|
||||||
|
only administrators can modify) -- and they are currently trying to use
|
||||||
|
that mapping -- then /proc/$pid/setgroups will be set to deny. This
|
||||||
|
workaround is only partial, because ideally it should be possible to set
|
||||||
|
an "allow_setgroups" or "deny_setgroups" flag in /etc/subgid to allow
|
||||||
|
administrators to further restrict newgidmap(1).
|
||||||
|
|
||||||
|
We also don't write anything in the "allow" case because "allow" is the
|
||||||
|
default, and users may have already written "deny" even if they
|
||||||
|
technically are allowed to use setgroups. And we don't write anything if
|
||||||
|
the setgroups policy is already "deny".
|
||||||
|
|
||||||
|
Ref: https://bugs.launchpad.net/ubuntu/+source/shadow/+bug/1729357
|
||||||
|
Fixes: CVE-2018-7169
|
||||||
|
Reported-by: Craig Furman <craig.furman89@gmail.com>
|
||||||
|
Signed-off-by: Aleksa Sarai <asarai@suse.de>
|
||||||
|
---
|
||||||
|
src/newgidmap.c | 89 ++++++++++++++++++++++++++++++++++++++++++++-----
|
||||||
|
1 file changed, 80 insertions(+), 9 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/src/newgidmap.c b/src/newgidmap.c
|
||||||
|
index b1e33513..59a2e75c 100644
|
||||||
|
--- a/src/newgidmap.c
|
||||||
|
+++ b/src/newgidmap.c
|
||||||
|
@@ -46,32 +46,37 @@
|
||||||
|
*/
|
||||||
|
const char *Prog;
|
||||||
|
|
||||||
|
-static bool verify_range(struct passwd *pw, struct map_range *range)
|
||||||
|
+
|
||||||
|
+static bool verify_range(struct passwd *pw, struct map_range *range, bool *allow_setgroups)
|
||||||
|
{
|
||||||
|
/* An empty range is invalid */
|
||||||
|
if (range->count == 0)
|
||||||
|
return false;
|
||||||
|
|
||||||
|
- /* Test /etc/subgid */
|
||||||
|
- if (have_sub_gids(pw->pw_name, range->lower, range->count))
|
||||||
|
+ /* Test /etc/subgid. If the mapping is valid then we allow setgroups. */
|
||||||
|
+ if (have_sub_gids(pw->pw_name, range->lower, range->count)) {
|
||||||
|
+ *allow_setgroups = true;
|
||||||
|
return true;
|
||||||
|
+ }
|
||||||
|
|
||||||
|
- /* Allow a process to map its own gid */
|
||||||
|
- if ((range->count == 1) && (pw->pw_gid == range->lower))
|
||||||
|
+ /* Allow a process to map its own gid. */
|
||||||
|
+ if ((range->count == 1) && (pw->pw_gid == range->lower)) {
|
||||||
|
+ /* noop -- if setgroups is enabled already we won't disable it. */
|
||||||
|
return true;
|
||||||
|
+ }
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void verify_ranges(struct passwd *pw, int ranges,
|
||||||
|
- struct map_range *mappings)
|
||||||
|
+ struct map_range *mappings, bool *allow_setgroups)
|
||||||
|
{
|
||||||
|
struct map_range *mapping;
|
||||||
|
int idx;
|
||||||
|
|
||||||
|
mapping = mappings;
|
||||||
|
for (idx = 0; idx < ranges; idx++, mapping++) {
|
||||||
|
- if (!verify_range(pw, mapping)) {
|
||||||
|
+ if (!verify_range(pw, mapping, allow_setgroups)) {
|
||||||
|
fprintf(stderr, _( "%s: gid range [%lu-%lu) -> [%lu-%lu) not allowed\n"),
|
||||||
|
Prog,
|
||||||
|
mapping->upper,
|
||||||
|
@@ -89,6 +94,70 @@ static void usage(void)
|
||||||
|
exit(EXIT_FAILURE);
|
||||||
|
}
|
||||||
|
|
||||||
|
+void write_setgroups(int proc_dir_fd, bool allow_setgroups)
|
||||||
|
+{
|
||||||
|
+ int setgroups_fd;
|
||||||
|
+ char *policy, policy_buffer[4096];
|
||||||
|
+
|
||||||
|
+ /*
|
||||||
|
+ * Default is "deny", and any "allow" will out-rank a "deny". We don't
|
||||||
|
+ * forcefully write an "allow" here because the process we are writing
|
||||||
|
+ * mappings for may have already set themselves to "deny" (and "allow"
|
||||||
|
+ * is the default anyway). So allow_setgroups == true is a noop.
|
||||||
|
+ */
|
||||||
|
+ policy = "deny\n";
|
||||||
|
+ if (allow_setgroups)
|
||||||
|
+ return;
|
||||||
|
+
|
||||||
|
+ setgroups_fd = openat(proc_dir_fd, "setgroups", O_RDWR|O_CLOEXEC);
|
||||||
|
+ if (setgroups_fd < 0) {
|
||||||
|
+ /*
|
||||||
|
+ * If it's an ENOENT then we are on too old a kernel for the setgroups
|
||||||
|
+ * code to exist. Emit a warning and bail on this.
|
||||||
|
+ */
|
||||||
|
+ if (ENOENT == errno) {
|
||||||
|
+ fprintf(stderr, _("%s: kernel doesn't support setgroups restrictions\n"), Prog);
|
||||||
|
+ goto out;
|
||||||
|
+ }
|
||||||
|
+ fprintf(stderr, _("%s: couldn't open process setgroups: %s\n"),
|
||||||
|
+ Prog,
|
||||||
|
+ strerror(errno));
|
||||||
|
+ exit(EXIT_FAILURE);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ /*
|
||||||
|
+ * Check whether the policy is already what we want. /proc/self/setgroups
|
||||||
|
+ * is write-once, so attempting to write after it's already written to will
|
||||||
|
+ * fail.
|
||||||
|
+ */
|
||||||
|
+ if (read(setgroups_fd, policy_buffer, sizeof(policy_buffer)) < 0) {
|
||||||
|
+ fprintf(stderr, _("%s: failed to read setgroups: %s\n"),
|
||||||
|
+ Prog,
|
||||||
|
+ strerror(errno));
|
||||||
|
+ exit(EXIT_FAILURE);
|
||||||
|
+ }
|
||||||
|
+ if (!strncmp(policy_buffer, policy, strlen(policy)))
|
||||||
|
+ goto out;
|
||||||
|
+
|
||||||
|
+ /* Write the policy. */
|
||||||
|
+ if (lseek(setgroups_fd, 0, SEEK_SET) < 0) {
|
||||||
|
+ fprintf(stderr, _("%s: failed to seek setgroups: %s\n"),
|
||||||
|
+ Prog,
|
||||||
|
+ strerror(errno));
|
||||||
|
+ exit(EXIT_FAILURE);
|
||||||
|
+ }
|
||||||
|
+ if (dprintf(setgroups_fd, "%s", policy) < 0) {
|
||||||
|
+ fprintf(stderr, _("%s: failed to setgroups %s policy: %s\n"),
|
||||||
|
+ Prog,
|
||||||
|
+ policy,
|
||||||
|
+ strerror(errno));
|
||||||
|
+ exit(EXIT_FAILURE);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+out:
|
||||||
|
+ close(setgroups_fd);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
/*
|
||||||
|
* newgidmap - Set the gid_map for the specified process
|
||||||
|
*/
|
||||||
|
@@ -103,6 +172,7 @@ int main(int argc, char **argv)
|
||||||
|
struct stat st;
|
||||||
|
struct passwd *pw;
|
||||||
|
int written;
|
||||||
|
+ bool allow_setgroups = false;
|
||||||
|
|
||||||
|
Prog = Basename (argv[0]);
|
||||||
|
|
||||||
|
@@ -145,7 +215,7 @@ int main(int argc, char **argv)
|
||||||
|
(unsigned long) getuid ()));
|
||||||
|
return EXIT_FAILURE;
|
||||||
|
}
|
||||||
|
-
|
||||||
|
+
|
||||||
|
/* Get the effective uid and effective gid of the target process */
|
||||||
|
if (fstat(proc_dir_fd, &st) < 0) {
|
||||||
|
fprintf(stderr, _("%s: Could not stat directory for target %u\n"),
|
||||||
|
@@ -177,8 +247,9 @@ int main(int argc, char **argv)
|
||||||
|
if (!mappings)
|
||||||
|
usage();
|
||||||
|
|
||||||
|
- verify_ranges(pw, ranges, mappings);
|
||||||
|
+ verify_ranges(pw, ranges, mappings, &allow_setgroups);
|
||||||
|
|
||||||
|
+ write_setgroups(proc_dir_fd, allow_setgroups);
|
||||||
|
write_mapping(proc_dir_fd, ranges, mappings, "gid_map");
|
||||||
|
sub_gid_close();
|
||||||
|
|
||||||
|
--
|
||||||
|
2.30.2
|
||||||
|
|
||||||
142
debian/patches/0002-gpasswd-1-Fix-password-leak.patch
vendored
Normal file
142
debian/patches/0002-gpasswd-1-Fix-password-leak.patch
vendored
Normal file
@@ -0,0 +1,142 @@
|
|||||||
|
From c64784990ca4de6e998f67796faa7bafc15dab00 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Alejandro Colomar <alx@kernel.org>
|
||||||
|
Date: Sat, 10 Jun 2023 16:20:05 +0200
|
||||||
|
Subject: gpasswd(1): Fix password leak
|
||||||
|
|
||||||
|
How to trigger this password leak?
|
||||||
|
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
|
|
||||||
|
When gpasswd(1) asks for the new password, it asks twice (as is usual
|
||||||
|
for confirming the new password). Each of those 2 password prompts
|
||||||
|
uses agetpass() to get the password. If the second agetpass() fails,
|
||||||
|
the first password, which has been copied into the 'static' buffer
|
||||||
|
'pass' via STRFCPY(), wasn't being zeroed.
|
||||||
|
|
||||||
|
agetpass() is defined in <./libmisc/agetpass.c> (around line 91), and
|
||||||
|
can fail for any of the following reasons:
|
||||||
|
|
||||||
|
- malloc(3) or readpassphrase(3) failure.
|
||||||
|
|
||||||
|
These are going to be difficult to trigger. Maybe getting the system
|
||||||
|
to the limits of memory utilization at that exact point, so that the
|
||||||
|
next malloc(3) gets ENOMEM, and possibly even the OOM is triggered.
|
||||||
|
About readpassphrase(3), ENFILE and EINTR seem the only plausible
|
||||||
|
ones, and EINTR probably requires privilege or being the same user;
|
||||||
|
but I wouldn't discard ENFILE so easily, if a process starts opening
|
||||||
|
files.
|
||||||
|
|
||||||
|
- The password is longer than PASS_MAX.
|
||||||
|
|
||||||
|
The is plausible with physical access. However, at that point, a
|
||||||
|
keylogger will be a much simpler attack.
|
||||||
|
|
||||||
|
And, the attacker must be able to know when the second password is being
|
||||||
|
introduced, which is not going to be easy.
|
||||||
|
|
||||||
|
How to read the password after the leak?
|
||||||
|
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
|
|
||||||
|
Provoking the leak yourself at the right point by entering a very long
|
||||||
|
password is easy, and inspecting the process stack at that point should
|
||||||
|
be doable. Try to find some consistent patterns.
|
||||||
|
|
||||||
|
Then, search for those patterns in free memory, right after the victim
|
||||||
|
leaks their password.
|
||||||
|
|
||||||
|
Once you get the leak, a program should read all the free memory
|
||||||
|
searching for patterns that gpasswd(1) leaves nearby the leaked
|
||||||
|
password.
|
||||||
|
|
||||||
|
On 6/10/23 03:14, Seth Arnold wrote:
|
||||||
|
> An attacker process wouldn't be able to use malloc(3) for this task.
|
||||||
|
> There's a handful of tools available for userspace to allocate memory:
|
||||||
|
>
|
||||||
|
> - brk / sbrk
|
||||||
|
> - mmap MAP_ANONYMOUS
|
||||||
|
> - mmap /dev/zero
|
||||||
|
> - mmap some other file
|
||||||
|
> - shm_open
|
||||||
|
> - shmget
|
||||||
|
>
|
||||||
|
> Most of these return only pages of zeros to a process. Using mmap of an
|
||||||
|
> existing file, you can get some of the contents of the file demand-loaded
|
||||||
|
> into the memory space on the first use.
|
||||||
|
>
|
||||||
|
> The MAP_UNINITIALIZED flag only works if the kernel was compiled with
|
||||||
|
> CONFIG_MMAP_ALLOW_UNINITIALIZED. This is rare.
|
||||||
|
>
|
||||||
|
> malloc(3) doesn't zero memory, to our collective frustration, but all the
|
||||||
|
> garbage in the allocations is from previous allocations in the current
|
||||||
|
> process. It isn't leftover from other processes.
|
||||||
|
>
|
||||||
|
> The avenues available for reading the memory:
|
||||||
|
> - /dev/mem and /dev/kmem (requires root, not available with Secure Boot)
|
||||||
|
> - /proc/pid/mem (requires ptrace privileges, mediated by YAMA)
|
||||||
|
> - ptrace (requires ptrace privileges, mediated by YAMA)
|
||||||
|
> - causing memory to be swapped to disk, and then inspecting the swap
|
||||||
|
>
|
||||||
|
> These all require a certain amount of privileges.
|
||||||
|
|
||||||
|
How to fix it?
|
||||||
|
~~~~~~~~~~~~~~
|
||||||
|
|
||||||
|
memzero(), which internally calls explicit_bzero(3), or whatever
|
||||||
|
alternative the system provides with a slightly different name, will
|
||||||
|
make sure that the buffer is zeroed in memory, and optimizations are not
|
||||||
|
allowed to impede this zeroing.
|
||||||
|
|
||||||
|
This is not really 100% effective, since compilers may place copies of
|
||||||
|
the string somewhere hidden in the stack. Those copies won't get zeroed
|
||||||
|
by explicit_bzero(3). However, that's arguably a compiler bug, since
|
||||||
|
compilers should make everything possible to avoid optimizing strings
|
||||||
|
that are later passed to explicit_bzero(3). But we all know that
|
||||||
|
sometimes it's impossible to have perfect knowledge in the compiler, so
|
||||||
|
this is plausible. Nevertheless, there's nothing we can do against such
|
||||||
|
issues, except minimizing the time such passwords are stored in plain
|
||||||
|
text.
|
||||||
|
|
||||||
|
Security concerns
|
||||||
|
~~~~~~~~~~~~~~~~~
|
||||||
|
|
||||||
|
We believe this isn't easy to exploit. Nevertheless, and since the fix
|
||||||
|
is trivial, this fix should probably be applied soon, and backported to
|
||||||
|
all supported distributions, to prevent someone else having more
|
||||||
|
imagination than us to find a way.
|
||||||
|
|
||||||
|
Affected versions
|
||||||
|
~~~~~~~~~~~~~~~~~
|
||||||
|
|
||||||
|
All. Bug introduced in shadow 19990709. That's the second commit in
|
||||||
|
the git history.
|
||||||
|
|
||||||
|
Fixes: 45c6603cc86c ("[svn-upgrade] Integrating new upstream version, shadow (19990709)")
|
||||||
|
Reported-by: Alejandro Colomar <alx@kernel.org>
|
||||||
|
Cc: Serge Hallyn <serge@hallyn.com>
|
||||||
|
Cc: Iker Pedrosa <ipedrosa@redhat.com>
|
||||||
|
Cc: Seth Arnold <seth.arnold@canonical.com>
|
||||||
|
Cc: Christian Brauner <christian@brauner.io>
|
||||||
|
Cc: Balint Reczey <rbalint@debian.org>
|
||||||
|
Cc: Sam James <sam@gentoo.org>
|
||||||
|
Cc: David Runge <dvzrv@archlinux.org>
|
||||||
|
Cc: Andreas Jaeger <aj@suse.de>
|
||||||
|
Cc: <~hallyn/shadow@lists.sr.ht>
|
||||||
|
Signed-off-by: Alejandro Colomar <alx@kernel.org>
|
||||||
|
---
|
||||||
|
src/gpasswd.c | 1 +
|
||||||
|
1 file changed, 1 insertion(+)
|
||||||
|
|
||||||
|
diff --git a/src/gpasswd.c b/src/gpasswd.c
|
||||||
|
index c4a492b1..cbbd8068 100644
|
||||||
|
--- a/src/gpasswd.c
|
||||||
|
+++ b/src/gpasswd.c
|
||||||
|
@@ -917,6 +917,7 @@ static void change_passwd (struct group *gr)
|
||||||
|
strzero (cp);
|
||||||
|
cp = getpass (_("Re-enter new password: "));
|
||||||
|
if (NULL == cp) {
|
||||||
|
+ memzero (pass, sizeof pass);
|
||||||
|
exit (1);
|
||||||
|
}
|
||||||
|
|
||||||
|
--
|
||||||
|
2.30.2
|
||||||
|
|
||||||
45
debian/patches/0003-Added-control-character-check.patch
vendored
Normal file
45
debian/patches/0003-Added-control-character-check.patch
vendored
Normal file
@@ -0,0 +1,45 @@
|
|||||||
|
From d6f0f7cd86b189cf3bbd49e404864cb599e10244 Mon Sep 17 00:00:00 2001
|
||||||
|
From: tomspiderlabs <128755403+tomspiderlabs@users.noreply.github.com>
|
||||||
|
Date: Thu, 23 Mar 2023 23:39:38 +0000
|
||||||
|
Subject: Added control character check
|
||||||
|
|
||||||
|
Added control character check, returning -1 (to "err") if control characters are present.
|
||||||
|
---
|
||||||
|
lib/fields.c | 11 +++++++----
|
||||||
|
1 file changed, 7 insertions(+), 4 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/lib/fields.c b/lib/fields.c
|
||||||
|
index 649fae17..b8f13ba7 100644
|
||||||
|
--- a/lib/fields.c
|
||||||
|
+++ b/lib/fields.c
|
||||||
|
@@ -44,9 +44,9 @@
|
||||||
|
*
|
||||||
|
* The supplied field is scanned for non-printable and other illegal
|
||||||
|
* characters.
|
||||||
|
- * + -1 is returned if an illegal character is present.
|
||||||
|
- * + 1 is returned if no illegal characters are present, but the field
|
||||||
|
- * contains a non-printable character.
|
||||||
|
+ * + -1 is returned if an illegal or control character is present.
|
||||||
|
+ * + 1 is returned if no illegal or control characters are present,
|
||||||
|
+ * but the field contains a non-printable character.
|
||||||
|
* + 0 is returned otherwise.
|
||||||
|
*/
|
||||||
|
int valid_field (const char *field, const char *illegal)
|
||||||
|
@@ -68,10 +68,13 @@ int valid_field (const char *field, const char *illegal)
|
||||||
|
}
|
||||||
|
|
||||||
|
if (0 == err) {
|
||||||
|
- /* Search if there are some non-printable characters */
|
||||||
|
+ /* Search if there are non-printable or control characters */
|
||||||
|
for (cp = field; '\0' != *cp; cp++) {
|
||||||
|
if (!isprint (*cp)) {
|
||||||
|
err = 1;
|
||||||
|
+ }
|
||||||
|
+ if (!iscntrl (*cp)) {
|
||||||
|
+ err = -1;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
--
|
||||||
|
2.30.2
|
||||||
|
|
||||||
61
debian/patches/0004-Overhaul-valid_field.patch
vendored
Normal file
61
debian/patches/0004-Overhaul-valid_field.patch
vendored
Normal file
@@ -0,0 +1,61 @@
|
|||||||
|
From aad293ef78b1657978adb2049974805bf20af5bb Mon Sep 17 00:00:00 2001
|
||||||
|
From: =?UTF-8?q?Christian=20G=C3=B6ttsche?= <cgzones@googlemail.com>
|
||||||
|
Date: Fri, 31 Mar 2023 14:46:50 +0200
|
||||||
|
Subject: Overhaul valid_field()
|
||||||
|
|
||||||
|
e5905c4b ("Added control character check") introduced checking for
|
||||||
|
control characters but had the logic inverted, so it rejects all
|
||||||
|
characters that are not control ones.
|
||||||
|
|
||||||
|
Cast the character to `unsigned char` before passing to the character
|
||||||
|
checking functions to avoid UB.
|
||||||
|
|
||||||
|
Use strpbrk(3) for the illegal character test and return early.
|
||||||
|
---
|
||||||
|
lib/fields.c | 24 ++++++++++--------------
|
||||||
|
1 file changed, 10 insertions(+), 14 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/lib/fields.c b/lib/fields.c
|
||||||
|
index b8f13ba7..191257e8 100644
|
||||||
|
--- a/lib/fields.c
|
||||||
|
+++ b/lib/fields.c
|
||||||
|
@@ -60,26 +60,22 @@ int valid_field (const char *field, const char *illegal)
|
||||||
|
|
||||||
|
/* For each character of field, search if it appears in the list
|
||||||
|
* of illegal characters. */
|
||||||
|
+ if (illegal && NULL != strpbrk (field, illegal)) {
|
||||||
|
+ return -1;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ /* Search if there are non-printable or control characters */
|
||||||
|
for (cp = field; '\0' != *cp; cp++) {
|
||||||
|
- if (strchr (illegal, *cp) != NULL) {
|
||||||
|
+ unsigned char c = *cp;
|
||||||
|
+ if (!isprint (c)) {
|
||||||
|
+ err = 1;
|
||||||
|
+ }
|
||||||
|
+ if (iscntrl (c)) {
|
||||||
|
err = -1;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
- if (0 == err) {
|
||||||
|
- /* Search if there are non-printable or control characters */
|
||||||
|
- for (cp = field; '\0' != *cp; cp++) {
|
||||||
|
- if (!isprint (*cp)) {
|
||||||
|
- err = 1;
|
||||||
|
- }
|
||||||
|
- if (!iscntrl (*cp)) {
|
||||||
|
- err = -1;
|
||||||
|
- break;
|
||||||
|
- }
|
||||||
|
- }
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
return err;
|
||||||
|
}
|
||||||
|
|
||||||
|
--
|
||||||
|
2.30.2
|
||||||
|
|
||||||
43
debian/patches/CVE-2017-12424.patch
vendored
Normal file
43
debian/patches/CVE-2017-12424.patch
vendored
Normal file
@@ -0,0 +1,43 @@
|
|||||||
|
Origin: https://github.com/shadow-maint/shadow/commit/954e3d2e7113e9ac06632aee3c69b8d818cc8952
|
||||||
|
Reviewed-by: Sylvain Beucler <beuc@debian.org>
|
||||||
|
Last-Update: 2021-03-16
|
||||||
|
|
||||||
|
From 954e3d2e7113e9ac06632aee3c69b8d818cc8952 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Tomas Mraz <tmraz@fedoraproject.org>
|
||||||
|
Date: Fri, 31 Mar 2017 16:25:06 +0200
|
||||||
|
Subject: [PATCH] Fix buffer overflow if NULL line is present in db.
|
||||||
|
|
||||||
|
If ptr->line == NULL for an entry, the first cycle will exit,
|
||||||
|
but the second one will happily write past entries buffer.
|
||||||
|
We actually do not want to exit the first cycle prematurely
|
||||||
|
on ptr->line == NULL.
|
||||||
|
Signed-off-by: Tomas Mraz <tmraz@fedoraproject.org>
|
||||||
|
---
|
||||||
|
lib/commonio.c | 8 ++++----
|
||||||
|
1 file changed, 4 insertions(+), 4 deletions(-)
|
||||||
|
|
||||||
|
Index: shadow-4.4/lib/commonio.c
|
||||||
|
===================================================================
|
||||||
|
--- shadow-4.4.orig/lib/commonio.c
|
||||||
|
+++ shadow-4.4/lib/commonio.c
|
||||||
|
@@ -755,16 +755,16 @@ commonio_sort (struct commonio_db *db, i
|
||||||
|
for (ptr = db->head;
|
||||||
|
(NULL != ptr)
|
||||||
|
#if KEEP_NIS_AT_END
|
||||||
|
- && (NULL != ptr->line)
|
||||||
|
- && ( ('+' != ptr->line[0])
|
||||||
|
- && ('-' != ptr->line[0]))
|
||||||
|
+ && ((NULL == ptr->line)
|
||||||
|
+ || (('+' != ptr->line[0])
|
||||||
|
+ && ('-' != ptr->line[0])))
|
||||||
|
#endif
|
||||||
|
;
|
||||||
|
ptr = ptr->next) {
|
||||||
|
n++;
|
||||||
|
}
|
||||||
|
#if KEEP_NIS_AT_END
|
||||||
|
- if ((NULL != ptr) && (NULL != ptr->line)) {
|
||||||
|
+ if (NULL != ptr) {
|
||||||
|
nis = ptr;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
6
debian/patches/series
vendored
6
debian/patches/series
vendored
@@ -28,3 +28,9 @@
|
|||||||
501_commonio_group_shadow
|
501_commonio_group_shadow
|
||||||
# does not apply cleanly, please merge at upstream
|
# does not apply cleanly, please merge at upstream
|
||||||
1010_vietnamese_translation
|
1010_vietnamese_translation
|
||||||
|
|
||||||
|
CVE-2017-12424.patch
|
||||||
|
0001-newgidmap-enforce-setgroups-deny-if-self-mapping-a-g.patch
|
||||||
|
0002-gpasswd-1-Fix-password-leak.patch
|
||||||
|
0003-Added-control-character-check.patch
|
||||||
|
0004-Overhaul-valid_field.patch
|
||||||
|
|||||||
5
debian/securetty.linux
vendored
5
debian/securetty.linux
vendored
@@ -164,11 +164,6 @@ ttyM0
|
|||||||
ttyM1
|
ttyM1
|
||||||
#...
|
#...
|
||||||
|
|
||||||
# Unix98 PTY slaves
|
|
||||||
pts/0
|
|
||||||
pts/1
|
|
||||||
#...
|
|
||||||
|
|
||||||
# Technology Concepts serial card
|
# Technology Concepts serial card
|
||||||
ttyT0
|
ttyT0
|
||||||
ttyT1
|
ttyT1
|
||||||
|
|||||||
Reference in New Issue
Block a user