Skip to content

Commit 6af7f53

Browse files
xinpeng wangZeno-sole
authored andcommitted
fix: Use reduce setgid to fix CVE-2024-28085, compile and
install write, utmpdump, mesg pms: 299927
1 parent ff522c5 commit 6af7f53

5 files changed

Lines changed: 23 additions & 3 deletions

File tree

debian/bsdextrautils.install

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,12 @@ usr/bin/column
66
usr/bin/hexdump
77
usr/bin/look
88
usr/bin/ul
9+
usr/bin/write
910
<!nodoc> usr/share/man/man1/col.1
1011
<!nodoc> usr/share/man/man1/colcrt.1
1112
<!nodoc> usr/share/man/man1/colrm.1
1213
<!nodoc> usr/share/man/man1/column.1
1314
<!nodoc> usr/share/man/man1/hexdump.1
1415
<!nodoc> usr/share/man/man1/look.1
1516
<!nodoc> usr/share/man/man1/ul.1
17+
<!nodoc> usr/share/man/man1/write.1

debian/changelog

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
util-linux (2.40.4-3deepin3) unstable; urgency=medium
2+
3+
* Use reduce setgid to fix CVE-2024-28085, compile and
4+
* install write, utmpdump, mesg.
5+
6+
-- xinpeng.wang <wangxinpeng@uniontech.com> Thu, 13 Feb 2025 14:10:34 +0800
7+
18
util-linux (2.40.4-3deepin2) unstable; urgency=medium
29

310
* Port the code about umac to V25 of UOS.

debian/rules

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,10 @@ endif
2727
endif
2828

2929
# As a result of CVE-2024-28085, we no longer install mesg/write.
30-
CONFOPTS += --disable-mesg
31-
CONFOPTS += --disable-write
30+
#CONFOPTS += --disable-mesg
31+
#CONFOPTS += --disable-write
32+
33+
CONFOPTS += --enable-write
3234

3335
# build static versions of programs used in fdisk-udeb and util-linux-udeb
3436
CONFOPTS += --enable-static-programs=fdisk,sfdisk,blkid
@@ -45,11 +47,15 @@ CONFOPTS += --disable-chfn-chsh
4547
# => bsdmainutils
4648
CONFOPTS += --disable-cal
4749
# => wtmpdb
48-
CONFOPTS += --disable-last --disable-utmpdump
50+
#CONFOPTS += --disable-last --disable-utmpdump
51+
CONFOPTS += --disable-last
4952

5053
# Keep hwclock as GPLv2 (and others)
5154
CONFOPTS += --disable-hwclock-gplv3
5255

56+
# Reduce setgid programs (cf. CVE-2024-28085)
57+
CONFOPTS += --disable-use-tty-group
58+
5359
ifeq ($(DEB_HOST_ARCH),hurd-i386)
5460
# hurd porters plan to drop 32bit before 2038
5561
CONFOPTS += --disable-year2038

debian/util-linux-locales.install

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ usr/share/locale/*/*/util-linux.mo
99
<!nodoc> debian/tmp/usr/share/man/*/man1/hexdump.1
1010
<!nodoc> debian/tmp/usr/share/man/*/man1/look.1
1111
<!nodoc> debian/tmp/usr/share/man/*/man1/ul.1
12+
<!nodoc> debian/tmp/usr/share/man/*/man1/write.1
1213

1314
# bsdutils
1415
<!nodoc> debian/tmp/usr/share/man/*/man1/logger.1

debian/util-linux.install

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ usr/bin/ipcs
3434
usr/bin/isosize usr/sbin/
3535
[linux-any] usr/bin/lsns
3636
usr/bin/mcookie
37+
usr/bin/mesg
3738
[mips mipsel] usr/bin/mips
3839
[mips mipsel] usr/bin/mips32
3940
[mips mipsel] usr/bin/mips64
@@ -46,6 +47,7 @@ usr/bin/rev
4647
[s390x] usr/bin/s390x
4748
[linux-any] usr/bin/setpriv
4849
usr/bin/setsid
50+
usr/bin/utmpdump
4951
usr/bin/whereis
5052
[amd64] usr/bin/x86_64
5153
[linux-any] bin/dmesg usr/bin/
@@ -97,6 +99,7 @@ usr/bin/lslogins
9799
<!nodoc> usr/share/man/man1/lslogins.1
98100
[linux-any] <!nodoc> usr/share/man/man1/lsmem.1
99101
<!nodoc> usr/share/man/man1/mcookie.1
102+
<!nodoc> usr/share/man/man1/mesg.1
100103
[linux-any] <!nodoc> usr/share/man/man1/more.1
101104
<!nodoc> usr/share/man/man1/mountpoint.1
102105
<!nodoc> usr/share/man/man1/namei.1
@@ -112,6 +115,7 @@ usr/bin/lslogins
112115
[linux-any] <!nodoc> usr/share/man/man1/taskset.1
113116
[linux-any] <!nodoc> usr/share/man/man1/uclampset.1
114117
[linux-any] <!nodoc> usr/share/man/man1/unshare.1
118+
<!nodoc> usr/share/man/man1/utmpdump.1
115119
<!nodoc> usr/share/man/man1/whereis.1
116120
<!nodoc> usr/share/man/man5/adjtime_config.5
117121
<!nodoc> usr/share/man/man5/terminal-colors.d.5

0 commit comments

Comments
 (0)