Add EN-20:01, EN-20:01, and SA-20:01 through SA-20:03.
Approved by: so
This commit is contained in:
Gordon Tetlow
parent
b6c3f1683a
commit
f6a49b1e07
Notes:
svn2git
2020-12-08 03:00:23 +00:00
svn path=/head/; revision=53835
17 changed files with 894 additions and 0 deletions
33
share/security/patches/EN-20:01/ssp.patch
Normal file
33
share/security/patches/EN-20:01/ssp.patch
Normal file
|
|
@ -0,0 +1,33 @@
|
|||
--- lib/libc/secure/stack_protector.c.orig
|
||||
+++ lib/libc/secure/stack_protector.c
|
||||
@@ -40,11 +40,29 @@
|
||||
#include <unistd.h>
|
||||
#include "libc_private.h"
|
||||
|
||||
+/*
|
||||
+ * We give __guard_setup a defined priority early on so that statically linked
|
||||
+ * applications have a defined priority at which __stack_chk_guard will be
|
||||
+ * getting initialized. This will not matter to most applications, because
|
||||
+ * they're either not usually statically linked or they simply don't do things
|
||||
+ * in constructors that would be adversely affected by their positioning with
|
||||
+ * respect to this initialization.
|
||||
+ *
|
||||
+ * This conditional should be removed when GCC 4.2 is removed.
|
||||
+ */
|
||||
+#if __has_attribute(__constructor__) || __GNUC_PREREQ__(4, 3)
|
||||
+#define _GUARD_SETUP_CTOR_ATTR \
|
||||
+ __attribute__((__constructor__ (200), __used__));
|
||||
+#else
|
||||
+#define _GUARD_SETUP_CTOR_ATTR \
|
||||
+ __attribute__((__constructor__, __used__));
|
||||
+#endif
|
||||
+
|
||||
extern int __sysctl(const int *name, u_int namelen, void *oldp,
|
||||
size_t *oldlenp, void *newp, size_t newlen);
|
||||
|
||||
long __stack_chk_guard[8] = {0, 0, 0, 0, 0, 0, 0, 0};
|
||||
-static void __guard_setup(void) __attribute__((__constructor__, __used__));
|
||||
+static void __guard_setup(void) _GUARD_SETUP_CTOR_ATTR;
|
||||
static void __fail(const char *);
|
||||
void __stack_chk_fail(void);
|
||||
void __chk_fail(void);
|
||||
18
share/security/patches/EN-20:01/ssp.patch.asc
Normal file
18
share/security/patches/EN-20:01/ssp.patch.asc
Normal file
|
|
@ -0,0 +1,18 @@
|
|||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQKTBAABCgB9FiEE/A6HiuWv54gCjWNV05eS9J6n5cIFAl4wheBfFIAAAAAALgAo
|
||||
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEZD
|
||||
MEU4NzhBRTVBRkU3ODgwMjhENjM1NUQzOTc5MkY0OUVBN0U1QzIACgkQ05eS9J6n
|
||||
5cJjxg/5ATm/M6VVGLH8RR/VVdsEn0MaXnq8K8Mu/z42RzHhApPZuK9Rqxi0KllI
|
||||
HapRslvyE/PsgxP119jhrqRFpxyXkkQI27t8+muQalENRqMQr1TUzqRz8R/ULm/b
|
||||
1/O83JSzaCVuVgSSFIEi49PfLdkO7M/UYxSGm8OXKJiYR+5lbWORPdQH8iCx5CCv
|
||||
hXgE65yTFxS9ekOTlr3kBCe5p+Oy3e8HRmWGpStfWx/KIKZXxoC4Nhwg+zP3DoV+
|
||||
4S+mCpknPjDAtdEaL9cUxYQ1OUjIII+yQ91ZOkwoTMelvDMU/Aam6LIi6mBPTs3q
|
||||
nI+hNZlI5t7eE4jhdhDFxnH6hGKIFuQe9AsEz0wlMtyyyAnXWwuNzr9lAw1Stu8c
|
||||
ksC3rFgP2PWHxO42KzewDiBqLKnNxM8nN5m544qqASo9UNJnnQdooluuMWFlJ7iP
|
||||
Cr/QPQlNwAGiZ3GxI9t2TnUzUH8raWyKQokkgp5ZYwVIuO2Wxj/dKvbg+bQkXuqv
|
||||
BRz3TLWjPlGWwPpSCqQG0I5IQbq3YJK+r0lJ1cyONlDRsUTXe2Y2YUFdp4toTFR5
|
||||
43kQbU1dTcuydYQ8C/gU6wklneGhiswINL+aZHtGGw8IMz9kPvTAti1WmrHAWLph
|
||||
ADYr+VMT3Hds0FZfDmIhiBBcDI528Bz9pMXZBfP4YJhwRic+nic=
|
||||
=IKok
|
||||
-----END PGP SIGNATURE-----
|
||||
20
share/security/patches/EN-20:02/nmount.patch
Normal file
20
share/security/patches/EN-20:02/nmount.patch
Normal file
|
|
@ -0,0 +1,20 @@
|
|||
--- sys/kern/vfs_mount.c.orig
|
||||
+++ sys/kern/vfs_mount.c
|
||||
@@ -603,7 +603,7 @@
|
||||
*/
|
||||
fstypelen = 0;
|
||||
error = vfs_getopt(optlist, "fstype", (void **)&fstype, &fstypelen);
|
||||
- if (error || fstype[fstypelen - 1] != '\0') {
|
||||
+ if (error || fstypelen <= 0 || fstype[fstypelen - 1] != '\0') {
|
||||
error = EINVAL;
|
||||
if (errmsg != NULL)
|
||||
strncpy(errmsg, "Invalid fstype", errmsg_len);
|
||||
@@ -611,7 +611,7 @@
|
||||
}
|
||||
fspathlen = 0;
|
||||
error = vfs_getopt(optlist, "fspath", (void **)&fspath, &fspathlen);
|
||||
- if (error || fspath[fspathlen - 1] != '\0') {
|
||||
+ if (error || fspathlen <= 0 || fspath[fspathlen - 1] != '\0') {
|
||||
error = EINVAL;
|
||||
if (errmsg != NULL)
|
||||
strncpy(errmsg, "Invalid fspath", errmsg_len);
|
||||
18
share/security/patches/EN-20:02/nmount.patch.asc
Normal file
18
share/security/patches/EN-20:02/nmount.patch.asc
Normal file
|
|
@ -0,0 +1,18 @@
|
|||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQKTBAABCgB9FiEE/A6HiuWv54gCjWNV05eS9J6n5cIFAl4whedfFIAAAAAALgAo
|
||||
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEZD
|
||||
MEU4NzhBRTVBRkU3ODgwMjhENjM1NUQzOTc5MkY0OUVBN0U1QzIACgkQ05eS9J6n
|
||||
5cJKTBAAmQXDT2YnQ4jZkHw/ZpiqA5cVJQzaCDX4BC0gtJijdbHiewrxgSK0yw/6
|
||||
iguZ2YUCi+0SkjqGtSHNZgNk8JZ4Xdqicq47jxuNbh5ckDjlkR8h7BL+MWRYPLU/
|
||||
DtpUy3u66C/zXCJZMxUTCNwg5eJjCmJW9LXeVLVE3uGWQZ21eA8VM4LAmYnUOgVW
|
||||
cLjmyu7yQRVBtqkfVOD8yWMy0aLim6iwdxlun8MfFsQRJFiUXnz/3qJWlm85+mhC
|
||||
Agll8Ea8+VuhYnhqsy6ixEi82ISllKqGsysBH9X/PQevkx6jgNBMlDnvQ4ZNskFt
|
||||
P1GUZgcLnBW3qYeCvj0ob8kylnK1F8Vm5YLV/GU4m7ja56Q6xZzqfez/WuwB+8Pu
|
||||
epYZIglBrx1hXjZag9iUwWDNaHCjI+M+Ki49DbCsxBZUsj8/YPfh2OS+NBFcpWDp
|
||||
rExxzcfN23YeOpFawDeAHcMXRCBozqP/JEG+8Yv3tLmj7kPMxWmaOAc+Zm2EUEBq
|
||||
KYRAErAPbQUcZExaH/OHcJId0JV6llP+QYu55IhMPY04jAVIjaBAU3jh+Gm0V7CQ
|
||||
QV462nucMVtt/qCcFjcemVirZMpqYIbJ5ud1+9vqqPHJEOsbEmYTrcm7frBZtT6r
|
||||
tklX+u2rbl3fWVwhkOYTtax2YhxbKADG+vI2wxuVszn1qDLsZEg=
|
||||
=w1fm
|
||||
-----END PGP SIGNATURE-----
|
||||
29
share/security/patches/SA-20:01/libfetch.patch
Normal file
29
share/security/patches/SA-20:01/libfetch.patch
Normal file
|
|
@ -0,0 +1,29 @@
|
|||
--- lib/libfetch/fetch.c.orig
|
||||
+++ lib/libfetch/fetch.c
|
||||
@@ -332,6 +332,8 @@
|
||||
}
|
||||
if (dlen-- > 0)
|
||||
*dst++ = c;
|
||||
+ else
|
||||
+ return (NULL);
|
||||
}
|
||||
return (s);
|
||||
}
|
||||
@@ -381,11 +383,15 @@
|
||||
if (p && *p == '@') {
|
||||
/* username */
|
||||
q = fetch_pctdecode(u->user, URL, URL_USERLEN);
|
||||
+ if (q == NULL)
|
||||
+ goto ouch;
|
||||
|
||||
/* password */
|
||||
- if (*q == ':')
|
||||
+ if (*q == ':') {
|
||||
q = fetch_pctdecode(u->pwd, q + 1, URL_PWDLEN);
|
||||
-
|
||||
+ if (q == NULL)
|
||||
+ goto ouch;
|
||||
+ }
|
||||
p++;
|
||||
} else {
|
||||
p = URL;
|
||||
18
share/security/patches/SA-20:01/libfetch.patch.asc
Normal file
18
share/security/patches/SA-20:01/libfetch.patch.asc
Normal file
|
|
@ -0,0 +1,18 @@
|
|||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQKTBAABCgB9FiEE/A6HiuWv54gCjWNV05eS9J6n5cIFAl4whexfFIAAAAAALgAo
|
||||
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEZD
|
||||
MEU4NzhBRTVBRkU3ODgwMjhENjM1NUQzOTc5MkY0OUVBN0U1QzIACgkQ05eS9J6n
|
||||
5cI8uRAAjHeuD0Mz/5DVcAAY/eAA/hiN/maLEVbNAP+mqv3S5Xa7Iha/XWsq96ih
|
||||
qu6UnZeAhwRPBDC3tTAd6BlgGBvnAeLVkRto1SJFLjROGJOL9CXM1ohtxkKwSZpd
|
||||
xH2Y9kUj4vTfa/RL+ctE5xIsaMI5A23YJ4RaP/nB7BGOsXzSM62beeX4ibKrZPP2
|
||||
gtJC6OsJADnZnX/FGsfit9Ckc3DvYOyuxV/hj2PMwkNUt+xzoJ0wPVmEvglTMlcm
|
||||
0gFGfRUhvO4IetKpZG1+jfD5EngYsvcyswd1JazTZVflpUfGt6rACYw8rPbBNTXi
|
||||
pKhTgu4KUicTSq2A74Mfd7ClYyPAhLU5RMav/ydwTDYpjpt6+akWcxap9V4hwW5p
|
||||
8bxCt0bi/9eXhgt7PuSTV/NvRPvsuhoyXXLLodMAWwHHCvlJEs8PYM/Qwz2yd5V2
|
||||
FYHf1EaCV79vLYeqVa/CE5p9er783GwEvSmeeNKOHlBeOeb3Is7cdrTpFYwBS+sY
|
||||
RQhqccfEpSq0bUdpHyiKV6pvq0tfOhLyamTH/4SAPh3hC52uH90zejeGhPMmZ6ld
|
||||
ud3eN7Lz8sZsJRg9nq8GCfpS1x225twnVz15YAlaQCZ2+y9R/QxKZpt/H0X4o9Hp
|
||||
8fOpiyxbW79k7/OuZDEwmXk7oAl4z//uM97Z9bLkuLk9heiVgI0=
|
||||
=Vs4w
|
||||
-----END PGP SIGNATURE-----
|
||||
11
share/security/patches/SA-20:02/ipsec.patch
Normal file
11
share/security/patches/SA-20:02/ipsec.patch
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
--- sys/netipsec/ipsec.c.orig
|
||||
+++ sys/netipsec/ipsec.c
|
||||
@@ -1318,6 +1318,8 @@
|
||||
__func__, replay->overflow,
|
||||
ipsec_sa2str(sav, buf, sizeof(buf))));
|
||||
}
|
||||
+
|
||||
+ replay->count++;
|
||||
return (0);
|
||||
}
|
||||
|
||||
18
share/security/patches/SA-20:02/ipsec.patch.asc
Normal file
18
share/security/patches/SA-20:02/ipsec.patch.asc
Normal file
|
|
@ -0,0 +1,18 @@
|
|||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQKTBAABCgB9FiEE/A6HiuWv54gCjWNV05eS9J6n5cIFAl4whe9fFIAAAAAALgAo
|
||||
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEZD
|
||||
MEU4NzhBRTVBRkU3ODgwMjhENjM1NUQzOTc5MkY0OUVBN0U1QzIACgkQ05eS9J6n
|
||||
5cL22hAAp65Q2PDHj0Y5ykuTsXobEH6oD7DDmvL27PtY8mbT01hYu7jNxwycuzv3
|
||||
7ALZljpJN+1pwN6NV7+lOlVPj/VVCzHBIK1ga7uZi0Qv/CvzIRdazWOTMKDmbo9L
|
||||
4NzLZTrC4DcQmJI7YZptMy+2jlldBkYf9cEJRC2xPxAiKonLmRrBtR826VOLCV4a
|
||||
5FPtFObGAp1JYrspExzpyJ5U5Eh6Nxag3kgY3OwXPcIa6CfI2CeY2rp5rUhqwIy/
|
||||
6CewC4YP2kRL//auKFkXc8jTvgcIdUEPdmAEzKdmlpkE/xQ+twcAYxwkYxox8QVS
|
||||
dEACEOcVJ3krKo5r5dFrTdeu/fUmptvXsVR5iI/J/r997+fsqKG8O7N3J+HNYJWM
|
||||
r9zKJjfzRNYuTNwk15KxpfY3qx2d+G09mTVwTYJ/hG+LHyj9qgB/gVCyct/l82zQ
|
||||
93rlyDKN3EQiLNs1BgoSXSRz3IoS2NErccE5tSKPbphtbpdbxU6f45wHhEWyRO/b
|
||||
43yJwslmMIgSVoG1B2WftRuQBK9EmQSVpMvP3T6gJqr0ZyQuXLTWHpBg/vX79chQ
|
||||
R/necLTNP4+aQEDtv9d8GjkEkFqj6fLbe6nJiUdo0hME8WdbGfM+cjRSBUx5LvyS
|
||||
6yMddT9SPlu4PXiMn3OT1qmqsaUuozWL+UmS5QkmGwgkbBwGS6w=
|
||||
=wVs3
|
||||
-----END PGP SIGNATURE-----
|
||||
11
share/security/patches/SA-20:03/thrmisc.patch
Normal file
11
share/security/patches/SA-20:03/thrmisc.patch
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
--- sys/kern/imgact_elf.c.orig
|
||||
+++ sys/kern/imgact_elf.c
|
||||
@@ -2211,7 +2211,7 @@
|
||||
td = (struct thread *)arg;
|
||||
if (sb != NULL) {
|
||||
KASSERT(*sizep == sizeof(thrmisc), ("invalid size"));
|
||||
- bzero(&thrmisc._pad, sizeof(thrmisc._pad));
|
||||
+ bzero(&thrmisc, sizeof(thrmisc));
|
||||
strcpy(thrmisc.pr_tname, td->td_name);
|
||||
sbuf_bcat(sb, &thrmisc, sizeof(thrmisc));
|
||||
}
|
||||
18
share/security/patches/SA-20:03/thrmisc.patch.asc
Normal file
18
share/security/patches/SA-20:03/thrmisc.patch.asc
Normal file
|
|
@ -0,0 +1,18 @@
|
|||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQKTBAABCgB9FiEE/A6HiuWv54gCjWNV05eS9J6n5cIFAl4whfJfFIAAAAAALgAo
|
||||
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEZD
|
||||
MEU4NzhBRTVBRkU3ODgwMjhENjM1NUQzOTc5MkY0OUVBN0U1QzIACgkQ05eS9J6n
|
||||
5cJfyw/+LEyYZDvgLZGxH+vMhpFKaG/s02TCf4qz9alCkn20JvYJYPZQUW6zJfgh
|
||||
qjRwa4cP1uvbO+on7O0Ez6QHOfCec6QgFOdAh5H0R2u1kt7WZri6NjIZuxidJeuk
|
||||
BJMdg0uGlCwdI4kFXiRjhRBLDHJImD1WFuoCK+hiCYlYxYaVJ7lDSBPWx0q1MbTA
|
||||
8FSRcmohlRKjjuw6ANBpw84K9JJcNBw+WcMePdMCmU/JhhDSeVbxfs5UonBPu09o
|
||||
JIGqX4k5FMbSWFWdCEz4GrtAv8CtO3eT7ykv0B8qaDiW/NGq4l3h6koh/e0ZsWPj
|
||||
vyvf+989VCnQHvNSxlde+Hdl+5rR2Lu23gj3v9AcRlLNjfE/8nVvosh7QgTtf3oC
|
||||
ZgElZXBSTO7T4msBKLnFKwyPrHm1B0ZgGDGDHr7gngyYukt+eCyYlvA8qtsv3L+f
|
||||
UXyutsABSk73O3Jm/qLNad1g51/KTfhesVzaOo1LV1McmfqkEwdt5YDmsW/A4pUO
|
||||
V5Xhjc8a0pjp2looiIrZHOGqd4pgUhwl9JvdkGm0ab4VQdc67SzgJZYj5PzMeufU
|
||||
cUdsCzvLS0ioblz6osPEp+fzhXw/F12nSb7mWXTftnTmpkJXBJkepMU7vzxrL4Ds
|
||||
+KhqpqxM41XOy5my5E3FH9m0ZPhMKF7dRR6IEOkjF3eLOUc+J7M=
|
||||
=pyQC
|
||||
-----END PGP SIGNATURE-----
|
||||
Loading…
Add table
Add a link
Reference in a new issue