diff options
author | Gordon Tetlow <gordon@FreeBSD.org> | 2018-03-07 17:30:48 +0000 |
---|---|---|
committer | Gordon Tetlow <gordon@FreeBSD.org> | 2018-03-07 17:30:48 +0000 |
commit | 1adffe452d7d3792d22491aa8ab5eb8d64888f9a (patch) | |
tree | 944e9fce6729e6145d23aa7e93b7c06c9717b1b8 /share/security/patches | |
parent | b060bc7373f28cdb671b272958baf64b5828da8b (diff) | |
download | doc-1adffe452d7d3792d22491aa8ab5eb8d64888f9a.tar.gz doc-1adffe452d7d3792d22491aa8ab5eb8d64888f9a.zip |
Correct patches for 10.x along with updated advisory.
Notes
Notes:
svn path=/head/; revision=51470
Diffstat (limited to 'share/security/patches')
-rw-r--r-- | share/security/patches/SA-18:01/ipsec-10.patch | 6 | ||||
-rw-r--r-- | share/security/patches/SA-18:01/ipsec-10.patch.asc | 26 |
2 files changed, 16 insertions, 16 deletions
diff --git a/share/security/patches/SA-18:01/ipsec-10.patch b/share/security/patches/SA-18:01/ipsec-10.patch index d10b11368e..b6e2f79b01 100644 --- a/share/security/patches/SA-18:01/ipsec-10.patch +++ b/share/security/patches/SA-18:01/ipsec-10.patch @@ -8,11 +8,11 @@ + DPRINTF(("%s: bad mbuf length %u (expecting %lu)" + " for packet in SA %s/%08lx\n", __func__, + m->m_pkthdr.len, (u_long) (skip + authsize + rplen), -+ ipsec_address(&sav->sah->saidx.dst, buf, sizeof(buf)), ++ ipsec_address(&sav->sah->saidx.dst), + (u_long) ntohl(sav->spi))); + AHSTAT_INC(ahs_badauthl); -+ error = EACCES; -+ goto bad; ++ m_freem(m); ++ return EACCES; + } AHSTAT_ADD(ahs_ibytes, m->m_pkthdr.len - skip - hl); diff --git a/share/security/patches/SA-18:01/ipsec-10.patch.asc b/share/security/patches/SA-18:01/ipsec-10.patch.asc index 9c4389ad55..7442f0f40f 100644 --- a/share/security/patches/SA-18:01/ipsec-10.patch.asc +++ b/share/security/patches/SA-18:01/ipsec-10.patch.asc @@ -1,18 +1,18 @@ -----BEGIN PGP SIGNATURE----- -iQKTBAABCgB9FiEE/A6HiuWv54gCjWNV05eS9J6n5cIFAlqfhGpfFIAAAAAALgAo +iQKTBAABCgB9FiEE/A6HiuWv54gCjWNV05eS9J6n5cIFAlqgIOxfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEZD MEU4NzhBRTVBRkU3ODgwMjhENjM1NUQzOTc5MkY0OUVBN0U1QzIACgkQ05eS9J6n -5cKa+BAAg4G75ea9cM88a8lYwbYhkJtBXtFKI0ct0k0cur083WGBfwiAjvLvulas -wTC4agKfFYViZpk7/gXNtfwNsSwM25mA5qTUOgDErA1SbdQqKcZc+bH3NfeMdSwa -eeQ6xC4qBqgTINE8waXNal1IktqOy3/i/K/Glx6w2UDQrrH1s8PrHDjZBOm0cVlv -n3jM5jVUjIM4otfJxmdleMaF/NEWCbe6JoPxx5/rrPWjm/ZKa+t3Cbz4FNzl4PHO -IInFo6k0u9SKtdaAkGuEIOLtEwfULGcGATONxTGj62T7Yd+3NsmqKsj4eXQv2Aoo -Ez+GRws+QQcQqTHDnqNtAMuRfNXyHnmgKDTxH9DS4uWKIJjjungRJ2OCySSRelPX -GJmnljcuEr0zOx2JkRRKm3opOWRruqh2juFZr2vUD3eiWApqouWt2Jv4ddzuSBBZ -6uFdZJtrvwKIUhEE30V6XRIQOXc/QSQygfPgJ4lGNKMyv/IKOmZeT1JtYoU8a74I -3aX5grnV/fDQgjP6Ks2jwKuMrm9jcJYWEhnhg/rJFaHKcOFmdBde0I4RCraIhCgA -GX3uCFZRotYerNP2DeLhRuWsn4N6S3bAvAO/ICO2NYQEQe4WbVPF9TJNoXf3MBDd -HEAL5iNSD3PYCxmD7m2jAVb+Y0oDMlnsLxpM5eZZQtpNy2QWrjc= -=9maD +5cIdaBAAmNj+4+bMUdvUlsv5wYLWVmsEzVQi8uFJ95RqYZZYlH1VTBZLs0lu03gk +mKzelKexiwoW5tljdZPG7FfInXdy7uaat3iu95tI1QVMW/6x5bVuDIkDf2nr8D5Y +qYNyAQKKE0cMxoe/J8faSuABTpdNTAXTc0ZnTV1wcUC0KQDBQMCgDaMRCsR5DjJV +KErca5fnfidB57wf8XJpj/K/jkmGvuPj0g1ere2GAaQAXaiWSRnl5nyWTX64TXI5 +yhrGt0QqpjCkcU3sJPlUIupFe38x13tlLMYuNPZbLFBmL2nwrPluNftBnMA/iGiR +i/PBG3UKYoA0VjX6IMU2UGHZXBZFF8r7P+NTIOJ5qWlJoluqO/SliU11tzcgl9MM +Hq81nbSNa4I12eB/PTI2x3PRcs0Hc6LWMHSY/oomciHykzb+oCTtimN+vYbqzXzf +6VdeHZbuOEhNVyHd9kUWzQv3CY8OsnFZ3zja7IsxkYgDBmbrcVBzdPbf3j/31kSq +AdbErhlz30UVzGEZEiL8ZvIg7Z32MW3etauUYR9QFz5EcKNSd0C9+1+VGVofZEMJ +x//XRvXRIkcY1YY195d2iiRceBa+IZ2XtvKS0ByB+4ZImw0Emeq4Er9A3/GCnyp3 +KFj4udpGmUpjh5xXoEl0Pjt3q/JUhTkC0JWtvcrGQJ5kCO1y77A= +=gdOo -----END PGP SIGNATURE----- |