From patchwork Thu Sep 24 04:32:52 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ankur Tyagi X-Patchwork-Id: 99119 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 21433C98310 for ; Thu, 24 Sep 2026 04:33:32 +0000 (UTC) Received: from mail-pz2-f43.google.com (mail-pz2-f43.google.com [74.125.228.43]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.724.1790224404871480193 for ; Wed, 23 Sep 2026 21:33:24 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20251104 header.b=r4yj9NJA; spf=pass (domain: gmail.com, ip: 74.125.228.43, mailfrom: ankur.tyagi85@gmail.com) Received: by mail-pz2-f43.google.com with SMTP id d2e1a72fcca58-85469a34908so1149848b3a.0 for ; Wed, 23 Sep 2026 21:33:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1790224404; x=1790829204; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=HrhURTwkf/vjU3XSS+4oUzqkCQTwiM8RCxMDDQHaY7Q=; b=r4yj9NJA0WcPmpcAZdzusv1DkBqscaCH0YIbOVRPJub72kyy5rOD+0DUiaTaqvrEBc wwBUA3SSa6msavWiir5Y7ukHng72wYuvQzUenogUSjDFk06aU25x8Y+jgK27gvm49Fws Fue392dN6ZkTHBuH+gOrT6Z1e1txR0ZydUVaQaze4ZKtakDPi48Sx68HO/aBW9R8MpxF CUZqJ1ElmTtL1R0Q4p4Ezmd6dIJX8oM4YC5IwFJit0rma5FiDor6d1F8yM8h16hgvxaQ l2g+a0/35r6nte9XMaS6GDZjZB+6bTSpQfcWVz+TYtWZtFZsBjbALYK9R10CNahBdvn5 9gcQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790224404; x=1790829204; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=HrhURTwkf/vjU3XSS+4oUzqkCQTwiM8RCxMDDQHaY7Q=; b=SkNqtpm2feUevXtECbwL0ElM2y1/uIrGFIikc91b/khYcGYZzWo587gXT/GVwsArzk dVGcIWX3IQx3TEbopUUFcBuQGBHT/NzwBneNEFpwfSOALY48GMbYfCqiFyk5Ax0q2KK2 2vwOKpYsXD1ODxHyNfK9FSBHYu7wgxvKENCyELZmt+jml6HjXVE/6KtjIL2jB3WyyI+M BU3cFlP5nJqZX4IMJUmqEtayh6qB+WdAXlrVsdaDnLlKZcZm8ckGVZG10rXgpysm7VBs i2VXAlEsVZI1Cpgqd2JlyVhZBqdpHojGDFCGXAG2+vTL+zkBamguYH1nU190b9W1Jcwd +KWA== X-Gm-Message-State: AFuF++n8pz1u3OV7B8IUIpaX/cEb2Uw0IQwF5VRa0l/ylMzm+IEfh3sL YuzH6ksRwXHsdt2JpGzNDc96XooMsXVcWwpRl/eG4JfvZKRudBjtMv8x0JHxqA== X-Gm-Gg: AYBFou3JJVSBP2MJBBrE/hpx22yEmsU/TXUFfuqNouU3zPMYWfYpnsRjGf6XbmPwmLs qWdH/Icj5mmR2EFcX8/woNUti0cLWL3uRZ8cmUcVoPlZuTNe7WW0v1u53guAp2hMYG+iazTZIqy Sl4UPbWtZQMRFMTxKyKTLWf4LVG3U86ddT1LbBhkyOe2nekokfRMiDNLdkxO79rBcxWZvlPCUgL x4Qu+Ikx0YoSq2mYKYVAo6kTZFPjFhDrWubixq64NQ5Qbmya3qLZ4WIPif8dOzVWrVyNc3aVDQy ht0qbwS96oEDZ9AEBf8wjQtbBhRNgSYgLRQn5o7aXVFPdVoK2UhIzL/Rfc0znq8ae72T1peEdS/ a5VuNURMA1LYurDsl+xj/H1sDn5TpR2zsT4S2Q+Angnl5F+ixwDW/pqgB8N8bAS62+XLgewj7gX B9BWkGWYLARfjc/21SLGT2EGkYozP9b0jai1QsO/NiBVaM2CE1VYJLbDxdM+NGHt8kLbBp8ChvE RowSKtnGeo21Xf0zcL05UA= X-Received: by 2002:a05:6a00:4c9c:b0:878:34d7:6982 with SMTP id d2e1a72fcca58-87ea0bc854cmr940107b3a.48.1790224403921; Wed, 23 Sep 2026 21:33:23 -0700 (PDT) Received: from NVAPF55DW0D-IPD.. ([203.211.104.195]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-87d1e601b5dsm2189686b3a.61.2026.09.23.21.33.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Sep 2026 21:33:23 -0700 (PDT) From: ankur.tyagi85@gmail.com To: openembedded-devel@lists.openembedded.org Cc: Ankur Tyagi Subject: [oe][meta-oe][wrynose][PATCH 2/24] rabbitmq-c: patch CVE-2026-44236 Date: Thu, 24 Sep 2026 16:32:52 +1200 Message-ID: <20260924043315.1663186-2-ankur.tyagi85@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260924043315.1663186-1-ankur.tyagi85@gmail.com> References: <20260924043315.1663186-1-ankur.tyagi85@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 24 Sep 2026 04:33:32 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/130250 From: Ankur Tyagi Details: https://nvd.nist.gov/vuln/detail/cve-2026-44236 Signed-off-by: Ankur Tyagi --- .../rabbitmq-c/CVE-2026-44236.patch | 145 ++++++++++++++++++ .../rabbitmq-c/rabbitmq-c_0.15.0.bb | 1 + 2 files changed, 146 insertions(+) create mode 100644 meta-oe/recipes-connectivity/rabbitmq-c/rabbitmq-c/CVE-2026-44236.patch diff --git a/meta-oe/recipes-connectivity/rabbitmq-c/rabbitmq-c/CVE-2026-44236.patch b/meta-oe/recipes-connectivity/rabbitmq-c/rabbitmq-c/CVE-2026-44236.patch new file mode 100644 index 0000000000..3c8a5a71a3 --- /dev/null +++ b/meta-oe/recipes-connectivity/rabbitmq-c/rabbitmq-c/CVE-2026-44236.patch @@ -0,0 +1,145 @@ +From 17f19124ba26f9c924f9ab53bca975cb8673f862 Mon Sep 17 00:00:00 2001 +From: Kevin Valerio +Date: Tue, 28 Apr 2026 13:45:22 +0200 +Subject: [PATCH] fix(connection): enforce minimum frame_max + +(cherry picked from commit 4777d0b5c58cb02966a04a85832436bd66ed5d1f) + +CVE: CVE-2026-44236 +Upstream-Status: Backport [https://github.com/alanxz/rabbitmq-c/commit/4777d0b5c58cb02966a04a85832436bd66ed5d1f] +Signed-off-by: Ankur Tyagi +--- + README.md | 6 ++++- + librabbitmq/amqp_connection.c | 4 +++ + librabbitmq/amqp_socket.c | 1 + + tests/CMakeLists.txt | 5 +++- + tests/test_tune_connection.c | 51 +++++++++++++++++++++++++++++++++++ + 5 files changed, 65 insertions(+), 2 deletions(-) + create mode 100644 tests/test_tune_connection.c + +diff --git a/README.md b/README.md +index 7c02d52..2682993 100644 +--- a/README.md ++++ b/README.md +@@ -133,6 +133,10 @@ terminal window: + Please see the `examples` directory for short examples of the use of + the `librabbitmq` library. + ++During login, `frame_max` negotiation follows the AMQP minimum frame size. ++Values below `AMQP_FRAME_MIN_SIZE` are raised before the client sizes its ++outbound frame buffer or sends `connection.tune-ok`. ++ + ### Threading + + You cannot share a socket, an `amqp_connection_state_t`, or a channel +@@ -177,4 +181,4 @@ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS + BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +-SOFTWARE. +\ No newline at end of file ++SOFTWARE. +diff --git a/librabbitmq/amqp_connection.c b/librabbitmq/amqp_connection.c +index 4326ef7..f016fc1 100644 +--- a/librabbitmq/amqp_connection.c ++++ b/librabbitmq/amqp_connection.c +@@ -113,6 +113,10 @@ int amqp_tune_connection(amqp_connection_state_t state, int channel_max, + + ENFORCE_STATE(state, CONNECTION_STATE_IDLE); + ++ if (frame_max < AMQP_FRAME_MIN_SIZE) { ++ frame_max = AMQP_FRAME_MIN_SIZE; ++ } ++ + state->channel_max = channel_max; + state->frame_max = frame_max; + +diff --git a/librabbitmq/amqp_socket.c b/librabbitmq/amqp_socket.c +index 094ceb7..a7206c7 100644 +--- a/librabbitmq/amqp_socket.c ++++ b/librabbitmq/amqp_socket.c +@@ -1387,6 +1387,7 @@ static amqp_rpc_reply_t amqp_login_inner(amqp_connection_state_t state, + if (res < 0) { + goto error_res; + } ++ client_frame_max = (uint32_t)amqp_get_frame_max(state); + + { + amqp_connection_tune_ok_t s; +diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt +index 8c0aee0..624e7f5 100644 +--- a/tests/CMakeLists.txt ++++ b/tests/CMakeLists.txt +@@ -23,6 +23,10 @@ add_executable(test_status_enum + target_link_libraries(test_status_enum rabbitmq-static) + add_test(status_enum test_status_enum) + ++add_executable(test_tune_connection test_tune_connection.c) ++target_link_libraries(test_tune_connection rabbitmq-static) ++add_test(tune_connection test_tune_connection) ++ + add_executable(test_basic + test_basic.c) + target_link_libraries(test_basic rabbitmq-static) +@@ -40,4 +44,3 @@ add_test(sasl_mechanism test_sasl_mechanism) + add_executable(test_merge_capabilities test_merge_capabilities.c) + target_link_libraries(test_merge_capabilities rabbitmq-static) + add_test(merge_capabilities test_merge_capabilities) +- +diff --git a/tests/test_tune_connection.c b/tests/test_tune_connection.c +new file mode 100644 +index 0000000..276e18d +--- /dev/null ++++ b/tests/test_tune_connection.c +@@ -0,0 +1,51 @@ ++// Copyright 2007 - 2021, Alan Antonuk and the rabbitmq-c contributors. ++// SPDX-License-Identifier: mit ++ ++#include "amqp_private.h" ++#include ++#include ++ ++#include ++#include ++ ++static void expect_frame_max(int requested, int expected) { ++ int res; ++ amqp_connection_state_t state = amqp_new_connection(); ++ ++ if (state == NULL) { ++ fprintf(stderr, "amqp_new_connection failed\n"); ++ abort(); ++ } ++ ++ state->state = CONNECTION_STATE_IDLE; ++ ++ res = amqp_tune_connection(state, 0, requested, 0); ++ if (res != AMQP_STATUS_OK) { ++ fprintf(stderr, "amqp_tune_connection returned %d\n", res); ++ abort(); ++ } ++ ++ if (amqp_get_frame_max(state) != expected) { ++ fprintf(stderr, "expected frame_max %d, got %d\n", expected, ++ amqp_get_frame_max(state)); ++ abort(); ++ } ++ ++ if (state->outbound_buffer.len != (size_t)expected) { ++ fprintf(stderr, "expected outbound buffer length %d, got %zu\n", expected, ++ state->outbound_buffer.len); ++ abort(); ++ } ++ ++ amqp_destroy_connection(state); ++} ++ ++int main(void) { ++ expect_frame_max(0, AMQP_FRAME_MIN_SIZE); ++ expect_frame_max(1, AMQP_FRAME_MIN_SIZE); ++ expect_frame_max(AMQP_FRAME_MIN_SIZE - 1, AMQP_FRAME_MIN_SIZE); ++ expect_frame_max(AMQP_FRAME_MIN_SIZE, AMQP_FRAME_MIN_SIZE); ++ expect_frame_max(AMQP_DEFAULT_FRAME_SIZE, AMQP_DEFAULT_FRAME_SIZE); ++ ++ return 0; ++} diff --git a/meta-oe/recipes-connectivity/rabbitmq-c/rabbitmq-c_0.15.0.bb b/meta-oe/recipes-connectivity/rabbitmq-c/rabbitmq-c_0.15.0.bb index 642e1e443b..f3c2a52fa2 100644 --- a/meta-oe/recipes-connectivity/rabbitmq-c/rabbitmq-c_0.15.0.bb +++ b/meta-oe/recipes-connectivity/rabbitmq-c/rabbitmq-c_0.15.0.bb @@ -5,6 +5,7 @@ LICENSE = "MIT" SRC_URI = "git://github.com/alanxz/rabbitmq-c.git;branch=master;protocol=https \ file://CVE-2026-44235.patch \ + file://CVE-2026-44236.patch \ " SRCREV = "84b81cd97a1b5515d3d4b304796680da24c666d8"