From 924f05eee5caca47e18faf1045a08e63ef2221c9 Mon Sep 17 00:00:00 2001 From: Erlang/OTP Date: Thu, 20 Feb 2025 15:17:02 +0100 Subject: [PATCH 1/3] Update copyright year --- erts/emulator/beam/erl_process.c | 2 +- erts/emulator/beam/erl_process.h | 2 +- lib/ssh/src/ssh_sftpd.erl | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/erts/emulator/beam/erl_process.c b/erts/emulator/beam/erl_process.c index e90d180ec334..e08da7ae0119 100644 --- a/erts/emulator/beam/erl_process.c +++ b/erts/emulator/beam/erl_process.c @@ -1,7 +1,7 @@ /* * %CopyrightBegin% * - * Copyright Ericsson AB 1996-2024. All Rights Reserved. + * Copyright Ericsson AB 1996-2025. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/erts/emulator/beam/erl_process.h b/erts/emulator/beam/erl_process.h index 9d5e3732d0e9..6ac2b31858de 100644 --- a/erts/emulator/beam/erl_process.h +++ b/erts/emulator/beam/erl_process.h @@ -1,7 +1,7 @@ /* * %CopyrightBegin% * - * Copyright Ericsson AB 1996-2024. All Rights Reserved. + * Copyright Ericsson AB 1996-2025. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/lib/ssh/src/ssh_sftpd.erl b/lib/ssh/src/ssh_sftpd.erl index 6bcad0d056e7..f3d8053db02b 100644 --- a/lib/ssh/src/ssh_sftpd.erl +++ b/lib/ssh/src/ssh_sftpd.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2005-2021. All Rights Reserved. +%% Copyright Ericsson AB 2005-2025. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. From 6cf9e37ee05ab4ac107bf9d78fc647ef9c526e12 Mon Sep 17 00:00:00 2001 From: Erlang/OTP Date: Thu, 20 Feb 2025 15:17:03 +0100 Subject: [PATCH 2/3] Prepare release --- erts/doc/src/notes.xml | 16 ++++++++++++++++ erts/vsn.mk | 2 +- lib/ssh/doc/src/notes.xml | 15 +++++++++++++++ lib/ssh/vsn.mk | 2 +- make/otp_version_tickets | 5 ++--- 5 files changed, 35 insertions(+), 5 deletions(-) diff --git a/erts/doc/src/notes.xml b/erts/doc/src/notes.xml index bb4f401d8c28..73df2c24f986 100644 --- a/erts/doc/src/notes.xml +++ b/erts/doc/src/notes.xml @@ -31,6 +31,22 @@

This document describes the changes made to the ERTS application.

+
Erts 14.2.5.8 + +
Fixed Bugs and Malfunctions + + +

Fixed BEAM crash when a custom thread sends a large + map (>128 keys) externally encoded with for example + erl_drv_send_term().

+

+ Own Id: OTP-19495 Aux Id: GH-8208, PR-8209

+ + +
+ +
+
Erts 14.2.5.7
Fixed Bugs and Malfunctions diff --git a/erts/vsn.mk b/erts/vsn.mk index 3fbd4eea3620..05b735385caf 100644 --- a/erts/vsn.mk +++ b/erts/vsn.mk @@ -18,7 +18,7 @@ # %CopyrightEnd% # -VSN = 14.2.5.7 +VSN = 14.2.5.8 # Port number 4365 in 4.2 # Port number 4366 in 4.3 diff --git a/lib/ssh/doc/src/notes.xml b/lib/ssh/doc/src/notes.xml index caa8bc7cf515..395ee1d2f236 100644 --- a/lib/ssh/doc/src/notes.xml +++ b/lib/ssh/doc/src/notes.xml @@ -30,6 +30,21 @@ notes.xml +
Ssh 5.1.4.6 + +
Fixed Bugs and Malfunctions + + +

SFTP packets exceeding max packet size are not + processed and dropped.

+

+ Own Id: OTP-19466 Aux Id: ERIERL-1173, CVE-2025-26618

+ + +
+ +
+
Ssh 5.1.4.5
Fixed Bugs and Malfunctions diff --git a/lib/ssh/vsn.mk b/lib/ssh/vsn.mk index d95512e627dd..958e648fc4e0 100644 --- a/lib/ssh/vsn.mk +++ b/lib/ssh/vsn.mk @@ -1,4 +1,4 @@ #-*-makefile-*- ; force emacs to enter makefile-mode -SSH_VSN = 5.1.4.5 +SSH_VSN = 5.1.4.6 APP_VSN = "ssh-$(SSH_VSN)" diff --git a/make/otp_version_tickets b/make/otp_version_tickets index 528348007b14..787c4812cd4b 100644 --- a/make/otp_version_tickets +++ b/make/otp_version_tickets @@ -1,3 +1,2 @@ -OTP-19240 -OTP-19381 -OTP-19462 +OTP-19466 +OTP-19495 From a2da0bad3f2d49dc1878f46f2d2961144ae0e0cb Mon Sep 17 00:00:00 2001 From: Erlang/OTP Date: Thu, 20 Feb 2025 15:17:04 +0100 Subject: [PATCH 3/3] Updated OTP version --- OTP_VERSION | 2 +- otp_versions.table | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/OTP_VERSION b/OTP_VERSION index 4c564bb537fa..0982666208b9 100644 --- a/OTP_VERSION +++ b/OTP_VERSION @@ -1 +1 @@ -26.2.5.8 +26.2.5.9 diff --git a/otp_versions.table b/otp_versions.table index e09ae37839d9..ab7692689723 100644 --- a/otp_versions.table +++ b/otp_versions.table @@ -1,3 +1,4 @@ +OTP-26.2.5.9 : erts-14.2.5.8 ssh-5.1.4.6 # asn1-5.2.2 common_test-1.26.2.4 compiler-8.4.3.2 crypto-5.4.2.3 debugger-5.3.4 dialyzer-5.1.3.1 diameter-2.3.2.2 edoc-1.2.1 eldap-1.2.12 erl_docgen-1.5.2 erl_interface-5.5.1 et-1.7 eunit-2.9 ftp-1.2.1.1 inets-9.1.0.2 jinterface-1.14 kernel-9.2.4.6 megaco-4.5 mnesia-4.23.1.1 observer-2.15.1 odbc-2.14.2 os_mon-2.9.1 parsetools-2.5 public_key-1.15.1.5 reltool-1.0 runtime_tools-2.0.1 sasl-4.2.1 snmp-5.15 ssl-11.1.4.7 stdlib-5.2.3.3 syntax_tools-3.1 tftp-1.1.1 tools-3.6 wx-2.4.1 xmerl-1.3.34.1 : OTP-26.2.5.8 : erts-14.2.5.7 kernel-9.2.4.6 public_key-1.15.1.5 # asn1-5.2.2 common_test-1.26.2.4 compiler-8.4.3.2 crypto-5.4.2.3 debugger-5.3.4 dialyzer-5.1.3.1 diameter-2.3.2.2 edoc-1.2.1 eldap-1.2.12 erl_docgen-1.5.2 erl_interface-5.5.1 et-1.7 eunit-2.9 ftp-1.2.1.1 inets-9.1.0.2 jinterface-1.14 megaco-4.5 mnesia-4.23.1.1 observer-2.15.1 odbc-2.14.2 os_mon-2.9.1 parsetools-2.5 reltool-1.0 runtime_tools-2.0.1 sasl-4.2.1 snmp-5.15 ssh-5.1.4.5 ssl-11.1.4.7 stdlib-5.2.3.3 syntax_tools-3.1 tftp-1.1.1 tools-3.6 wx-2.4.1 xmerl-1.3.34.1 : OTP-26.2.5.7 : common_test-1.26.2.4 dialyzer-5.1.3.1 erts-14.2.5.6 kernel-9.2.4.5 ssh-5.1.4.5 ssl-11.1.4.7 # asn1-5.2.2 compiler-8.4.3.2 crypto-5.4.2.3 debugger-5.3.4 diameter-2.3.2.2 edoc-1.2.1 eldap-1.2.12 erl_docgen-1.5.2 erl_interface-5.5.1 et-1.7 eunit-2.9 ftp-1.2.1.1 inets-9.1.0.2 jinterface-1.14 megaco-4.5 mnesia-4.23.1.1 observer-2.15.1 odbc-2.14.2 os_mon-2.9.1 parsetools-2.5 public_key-1.15.1.4 reltool-1.0 runtime_tools-2.0.1 sasl-4.2.1 snmp-5.15 stdlib-5.2.3.3 syntax_tools-3.1 tftp-1.1.1 tools-3.6 wx-2.4.1 xmerl-1.3.34.1 : OTP-26.2.5.6 : common_test-1.26.2.3 erts-14.2.5.5 inets-9.1.0.2 kernel-9.2.4.4 mnesia-4.23.1.1 public_key-1.15.1.4 ssl-11.1.4.6 stdlib-5.2.3.3 # asn1-5.2.2 compiler-8.4.3.2 crypto-5.4.2.3 debugger-5.3.4 dialyzer-5.1.3 diameter-2.3.2.2 edoc-1.2.1 eldap-1.2.12 erl_docgen-1.5.2 erl_interface-5.5.1 et-1.7 eunit-2.9 ftp-1.2.1.1 jinterface-1.14 megaco-4.5 observer-2.15.1 odbc-2.14.2 os_mon-2.9.1 parsetools-2.5 reltool-1.0 runtime_tools-2.0.1 sasl-4.2.1 snmp-5.15 ssh-5.1.4.4 syntax_tools-3.1 tftp-1.1.1 tools-3.6 wx-2.4.1 xmerl-1.3.34.1 :