sys-apps/shadow: fix CVE-2023-29383

See: https://nvd.nist.gov/vuln/detail/CVE-2023-29383
Bug: https://bugs.gentoo.org/904518
Signed-off-by: Michael Vetter <jubalh@iodoru.org>
Closes: https://github.com/gentoo/gentoo/pull/30644
Signed-off-by: Mike Gilbert <floppym@gentoo.org>
This commit is contained in:
Michael Vetter
2023-04-18 12:33:34 -04:00
committed by Mike Gilbert
parent 02c000a5dc
commit f00fc3d195
2 changed files with 364 additions and 0 deletions
@@ -0,0 +1,100 @@
From e5905c4b84d4fb90aefcd96ee618411ebfac663d 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: [PATCH] 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 640be931f..fb51b5829 100644
--- a/lib/fields.c
+++ b/lib/fields.c
@@ -21,9 +21,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)
@@ -45,10 +45,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;
}
}
From 2eaea70111f65b16d55998386e4ceb4273c19eb4 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: [PATCH] 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 fb51b5829..539292485 100644
--- a/lib/fields.c
+++ b/lib/fields.c
@@ -37,26 +37,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;
}
+264
View File
@@ -0,0 +1,264 @@
# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
# Upstream sometimes pushes releases as pre-releases before marking them
# official. Don't keyword the pre-releases!
# Check https://github.com/shadow-maint/shadow/releases.
VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/sergehallyn.asc
inherit libtool pam verify-sig
DESCRIPTION="Utilities to deal with user accounts"
HOMEPAGE="https://github.com/shadow-maint/shadow"
SRC_URI="https://github.com/shadow-maint/shadow/releases/download/${PV}/${P}.tar.xz"
SRC_URI+=" verify-sig? ( https://github.com/shadow-maint/shadow/releases/download/${PV}/${P}.tar.xz.asc )"
LICENSE="BSD GPL-2"
# Subslot is for libsubid's SONAME.
SLOT="0/4"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
IUSE="acl audit bcrypt cracklib nls pam selinux skey split-usr su xattr"
# Taken from the man/Makefile.am file.
LANGS=( cs da de es fi fr hu id it ja ko pl pt_BR ru sv tr zh_CN zh_TW )
REQUIRED_USE="?? ( cracklib pam )"
COMMON_DEPEND="
virtual/libcrypt:=
acl? ( sys-apps/acl:0= )
audit? ( >=sys-process/audit-2.6:0= )
cracklib? ( >=sys-libs/cracklib-2.7-r3:0= )
nls? ( virtual/libintl )
pam? ( sys-libs/pam:0= )
skey? ( sys-auth/skey:0= )
selinux? (
>=sys-libs/libselinux-1.28:0=
sys-libs/libsemanage:0=
)
xattr? ( sys-apps/attr:0= )
"
DEPEND="${COMMON_DEPEND}
>=sys-kernel/linux-headers-4.14
"
RDEPEND="${COMMON_DEPEND}
!<sys-apps/man-pages-5.11-r1
!=sys-apps/man-pages-5.12-r0
!=sys-apps/man-pages-5.12-r1
nls? (
!<app-i18n/man-pages-it-5.06-r1
!<app-i18n/man-pages-ja-20180315-r1
!<app-i18n/man-pages-ru-5.03.2390.2390.20191017-r1
)
pam? ( >=sys-auth/pambase-20150213 )
su? ( !sys-apps/util-linux[su(-)] )
"
BDEPEND="
app-arch/xz-utils
sys-devel/gettext
verify-sig? ( sec-keys/openpgp-keys-sergehallyn )
"
PATCHES=(
"${FILESDIR}"/${P}-configure-clang16.patch
"${FILESDIR}"/${P}-CVE-2023-29383.patch
)
src_prepare() {
default
elibtoolize
}
src_configure() {
local myeconfargs=(
--disable-account-tools-setuid
--disable-static
--with-btrfs
--without-group-name-max-length
--without-tcb
$(use_enable nls)
$(use_with acl)
$(use_with audit)
$(use_with bcrypt)
$(use_with cracklib libcrack)
$(use_with elibc_glibc nscd)
$(use_with pam libpam)
$(use_with selinux)
$(use_with skey)
$(use_with su)
$(use_with xattr attr)
)
econf "${myeconfargs[@]}"
if use nls ; then
local l langs="po" # These are the pot files.
for l in ${LANGS[*]} ; do
has ${l} ${LINGUAS-${l}} && langs+=" ${l}"
done
sed -i "/^SUBDIRS = /s:=.*:= ${langs}:" man/Makefile || die
fi
}
set_login_opt() {
local comment="" opt=${1} val=${2}
if [[ -z ${val} ]]; then
comment="#"
sed -i \
-e "/^${opt}\>/s:^:#:" \
"${ED}"/etc/login.defs || die
else
sed -i -r \
-e "/^#?${opt}\>/s:.*:${opt} ${val}:" \
"${ED}"/etc/login.defs
fi
local res=$(grep "^${comment}${opt}\>" "${ED}"/etc/login.defs)
einfo "${res:-Unable to find ${opt} in /etc/login.defs}"
}
src_install() {
emake DESTDIR="${D}" suidperms=4711 install
# 4.9 regression: https://github.com/shadow-maint/shadow/issues/389
emake DESTDIR="${D}" -C man install
find "${ED}" -name '*.la' -type f -delete || die
insinto /etc
if ! use pam ; then
insopts -m0600
doins etc/login.access etc/limits
fi
# needed for 'useradd -D'
insinto /etc/default
insopts -m0600
doins "${FILESDIR}"/default/useradd
if use split-usr ; then
# move passwd to / to help recover broke systems #64441
# We cannot simply remove this or else net-misc/scponly
# and other tools will break because of hardcoded passwd
# location
dodir /bin
mv "${ED}"/usr/bin/passwd "${ED}"/bin/ || die
dosym ../../bin/passwd /usr/bin/passwd
fi
cd "${S}" || die
insinto /etc
insopts -m0644
newins etc/login.defs login.defs
set_login_opt CREATE_HOME yes
if ! use pam ; then
set_login_opt MAIL_CHECK_ENAB no
set_login_opt SU_WHEEL_ONLY yes
set_login_opt CRACKLIB_DICTPATH /usr/lib/cracklib_dict
set_login_opt LOGIN_RETRIES 3
set_login_opt ENCRYPT_METHOD SHA512
set_login_opt CONSOLE
else
dopamd "${FILESDIR}"/pam.d-include/shadow
for x in chsh chfn ; do
newpamd "${FILESDIR}"/pam.d-include/passwd ${x}
done
for x in chpasswd newusers ; do
newpamd "${FILESDIR}"/pam.d-include/chpasswd ${x}
done
newpamd "${FILESDIR}"/pam.d-include/shadow-r1 groupmems
# Comment out login.defs options that pam hates
local opt sed_args=()
for opt in \
CHFN_AUTH \
CONSOLE \
CRACKLIB_DICTPATH \
ENV_HZ \
ENVIRON_FILE \
FAILLOG_ENAB \
FTMP_FILE \
LASTLOG_ENAB \
MAIL_CHECK_ENAB \
MOTD_FILE \
NOLOGINS_FILE \
OBSCURE_CHECKS_ENAB \
PASS_ALWAYS_WARN \
PASS_CHANGE_TRIES \
PASS_MIN_LEN \
PORTTIME_CHECKS_ENAB \
QUOTAS_ENAB \
SU_WHEEL_ONLY
do
set_login_opt ${opt}
sed_args+=( -e "/^#${opt}\>/b pamnote" )
done
sed -i "${sed_args[@]}" \
-e 'b exit' \
-e ': pamnote; i# NOTE: This setting should be configured via /etc/pam.d/ and not in this file.' \
-e ': exit' \
"${ED}"/etc/login.defs || die
# Remove manpages that pam will install for us
# and/or don't apply when using pam
find "${ED}"/usr/share/man -type f \
'(' -name 'limits.5*' -o -name 'suauth.5*' ')' \
-delete
# Remove pam.d files provided by pambase.
rm "${ED}"/etc/pam.d/{login,passwd} || die
if use su ; then
rm "${ED}"/etc/pam.d/su || die
fi
fi
# Remove manpages that are handled by other packages
find "${ED}"/usr/share/man -type f \
'(' -name id.1 -o -name getspnam.3 ')' \
-delete || die
if ! use su ; then
find "${ED}"/usr/share/man -type f -name su.1 -delete || die
fi
cd "${S}" || die
dodoc ChangeLog NEWS TODO
newdoc README README.download
cd doc || die
dodoc HOWTO README* WISHLIST *.txt
}
pkg_preinst() {
rm -f "${EROOT}"/etc/pam.d/system-auth.new \
"${EROOT}/etc/login.defs.new"
}
pkg_postinst() {
# Missing entries from /etc/passwd can cause odd system blips.
# See bug #829872.
if ! pwck -r -q -R "${EROOT:-/}" &>/dev/null ; then
ewarn "Running 'pwck' returned errors. Please run it manually to fix any errors."
fi
# Enable shadow groups.
if [[ ! -f "${EROOT}"/etc/gshadow ]] ; then
if grpck -r -R "${EROOT:-/}" 2>/dev/null ; then
grpconv -R "${EROOT:-/}"
else
ewarn "Running 'grpck' returned errors. Please run it by hand, and then"
ewarn "run 'grpconv' afterwards!"
fi
fi
[[ ! -f "${EROOT}"/etc/subgid ]] &&
touch "${EROOT}"/etc/subgid
[[ ! -f "${EROOT}"/etc/subuid ]] &&
touch "${EROOT}"/etc/subuid
einfo "The 'adduser' symlink to 'useradd' has been dropped."
}