From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ed1-f52.google.com (mail-ed1-f52.google.com [209.85.208.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 11D401519B4 for ; Sat, 6 Sep 2025 01:20:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.52 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757121622; cv=none; b=fEcAmCjrbsE/IJaMbHOJ2Nh5yuL85KfXoVv58g+6h1ANqDx/y/qkxQqJuXoOjYRy/v6bcO7BJvLaf+Q0u4EHmwPNaYUhuDk2jgyUYjraqxgMEP1FCAZ2pP3AkQBSzM48SWmXk8ZRtezNsOlwJ0dI5S5ANG2REZ+/qmREPnx6nuk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757121622; c=relaxed/simple; bh=OZfmvUtSyXTRBokVQWrm6BmwrIq4AfkWxUHBYagVBJY=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=PWrptUd/iuFoAnIXSNsMuadxl5ds2Bl9uLK9zxE0DkIImdlr6oPgnUBlC6mJTn2PLmD/x4d5FvxZS0m7E7i9+ZzNFVud+PpIrJ0ITOw8hFzAECD1N0bewVRN7TF/YxzcffwvYZ8dmZyL9XXRJ5dG2pf8x4aNzGnxGAG86lYdX5o= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=aisle.com; spf=pass smtp.mailfrom=aisle.com; dkim=pass (2048-bit key) header.d=aisle.com header.i=@aisle.com header.b=EDPobhn3; arc=none smtp.client-ip=209.85.208.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=aisle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=aisle.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=aisle.com header.i=@aisle.com header.b="EDPobhn3" Received: by mail-ed1-f52.google.com with SMTP id 4fb4d7f45d1cf-6188b5ad4f0so4303937a12.0 for ; Fri, 05 Sep 2025 18:20:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=aisle.com; s=google; t=1757121618; x=1757726418; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=MhkCEPpqVmmHGdIendUwEnS7TAUpZx7akLTv5G7IgZ0=; b=EDPobhn32aZ9nGj5SpTcN5JKbAXkMu3DWrU4z2VeH1PS3Qm9C6jhu0qC1vVaTeLMXU YvHxzeHlclV6yQGfrY+yD7iAXxRQX/IzxU7TuVq4kzWUQWBAcgfsAqQjcVbB5pLmpPm5 H3oPILOM7b6DvrqboaXuqzv/qNiIiKBVLRMY8xG4I/VEPvPPFY0YIINXx63L9TXB7N0h M0ODKa13l7qr/CvVj790JJbUQU8zKLdxP9IYWMFytMIcQWsKbqK6LbJmzSc+V3htvtUc qSh0z8f4V+ucsSHuWzYmCqh901hCKxUmdSq6mWwH+HejjnVvtM8Ke/dKqILbbIB5Cx8y oVPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757121618; x=1757726418; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=MhkCEPpqVmmHGdIendUwEnS7TAUpZx7akLTv5G7IgZ0=; b=lyilzpE1DE43hBaRQ81TnyWEnvVjoXJXi4xbQvz24A+8IGdW9tvZsc2RvSHcpi1xqT cIUA3mrOYh5pzWUWQi9onjM1fGYYQcvMDuPl6SOzVpVpF4ZIS4ZCiCu1Y+Z0BQTHP8rR /KUV3/WuM1Z3mIRs5v+jytjKnPJgcHEh2ol01l/vyLdAQzuLv3BVS5b04X3kENpdSP79 tiPkTAKHSnI1f8gGtKFi8aplw0WXLBdRUDgDpPJQUei7V4O88oIHW48/7GdutRexuxZ9 xZsgQ3BRPLTxHitFUpfYbqXTOQjJAeBZpQ6BbnB/uudGmFRodceKlEOpOy1y5Qi7F2sE FxXg== X-Forwarded-Encrypted: i=1; AJvYcCULb7wCoicAodHBLvUBCNXuqaQTBnaXL8yPueOa2kt6Q4c+p41JgSefU+G2lOvaLzzprPHAPPU=@vger.kernel.org X-Gm-Message-State: AOJu0Yz9TpDRZ9m3v6v64OySyYUTFJkQF7VKSfxlQdvzRRE27vZd2WRP xsAZy12aa64J/vsuUaGdHVaSscd8Wanx8rSMP/gWuU7Hz7jcH9vEzppPljfbFJkeq3M= X-Gm-Gg: ASbGncv5XCicLewjrjQXgLa7lSFsHMqZolNrp9FHKqw+w5yhRaS+GoIScFHYfOpC711 qdH28RG7e0b0LoJATxK91lZFQNeXLq0jQ2sJVCwZxOzyTpcqVqtxI94P4MIExD1sVZ4xfYYwgNb Rx6KbUsvNmqh0IKRZhvW+018a68AycZugBx/TrjrG0OLUp+vF3TyXb+cK6/WvT8ZGIRWgQcDwp6 GISNFYg6UYEItXRqVkXqsLDuGanvl1EWeIJThMKzXiB/iJAD1HV90zVbSRLWpLL7yDKMrVAMkDZ RIRaCLhq3RVcRcW0dPxdTfYXDLKCXR6hpuiA0C7opqBOEddz/BDHY34o3mao3Exau70iy/dxcPT 8PKKLzagOTtTsg31GoVL8deXshLwsuCupLtB7aa7BNN7DqII= X-Google-Smtp-Source: AGHT+IGFMbR3iirc4diOpoMpZyM33hVySYIhjNMV95KRXjY0dEcC/hyOGyDBHtgZ0shcIt4Vk3AiBA== X-Received: by 2002:a05:6402:40c9:b0:61c:6fc9:daa with SMTP id 4fb4d7f45d1cf-6237edb2f07mr757777a12.20.1757121618390; Fri, 05 Sep 2025 18:20:18 -0700 (PDT) Received: from localhost ([149.102.246.10]) by smtp.gmail.com with UTF8SMTPSA id 4fb4d7f45d1cf-61cfc4e50fbsm17060426a12.38.2025.09.05.18.20.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Sep 2025 18:20:18 -0700 (PDT) From: Stanislav Fort X-Google-Original-From: Stanislav Fort To: netdev@vger.kernel.org Cc: davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, horms@kernel.org, linux-hams@vger.kernel.org, linux-kernel@vger.kernel.org, security@kernel.org, Stanislav Fort , stable@vger.kernel.org Subject: [PATCH net v4] netrom: linearize and validate lengths in nr_rx_frame() Date: Sat, 6 Sep 2025 04:20:16 +0300 Message-Id: <20250906012016.58856-1-disclosure@aisle.com> X-Mailer: git-send-email 2.39.3 (Apple Git-146) Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Linearize skb and add targeted length checks in nr_rx_frame() to prevent out-of-bounds reads and potential use-after-free (UAF) when processing malformed NET/ROM frames. - Require skb to be linear and at least NR_NETWORK_LEN + NR_TRANSPORT_LEN (20 bytes) before reading network/transport fields. - For existing sockets path, ensure NR_CONNACK includes the window byte (>= 21 bytes). - For CONNREQ handling, ensure window (byte 20) and user address (bytes 21-27) are present (>= 28 bytes). - Preserve existing BPQ extension handling: - NR_CONNACK len == 22 -> 1 extra byte (TTL) - NR_CONNREQ len == 37 -> 2 extra bytes (timeout) These validations block malformed frames from triggering bounds violations via short skbs. Because NET/ROM frames may originate from remote peers, the issue is externally triggerable and therefore security-relevant. Suggested-by: Eric Dumazet Reviewed-by: Eric Dumazet Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") Cc: stable@vger.kernel.org Signed-off-by: Stanislav Fort --- Changes since v3: - Wrap commit message at 74 columns - Add Fixes tag and Cc: stable - Drop Reported-by - Add Reviewed-by from Eric Dumazet --- net/netrom/af_netrom.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/net/netrom/af_netrom.c b/net/netrom/af_netrom.c index 3331669d8e33..f0660dd6d3b0 100644 --- a/net/netrom/af_netrom.c +++ b/net/netrom/af_netrom.c @@ -885,6 +885,11 @@ int nr_rx_frame(struct sk_buff *skb, struct net_device *dev) /* * skb->data points to the netrom frame start */ + if (skb_linearize(skb)) + return 0; + if (skb->len < NR_NETWORK_LEN + NR_TRANSPORT_LEN) + return 0; + src = (ax25_address *)(skb->data + 0); dest = (ax25_address *)(skb->data + 7); @@ -927,6 +932,11 @@ int nr_rx_frame(struct sk_buff *skb, struct net_device *dev) } if (sk != NULL) { + if (frametype == NR_CONNACK && + skb->len < NR_NETWORK_LEN + NR_TRANSPORT_LEN + 1) { + sock_put(sk); + return 0; + } bh_lock_sock(sk); skb_reset_transport_header(skb); @@ -961,10 +971,14 @@ int nr_rx_frame(struct sk_buff *skb, struct net_device *dev) return 0; } - sk = nr_find_listener(dest); + /* Need window (byte 20) and user address (bytes 21-27) */ + if (skb->len < NR_NETWORK_LEN + NR_TRANSPORT_LEN + 1 + AX25_ADDR_LEN) + return 0; user = (ax25_address *)(skb->data + 21); + sk = nr_find_listener(dest); + if (sk == NULL || sk_acceptq_is_full(sk) || (make = nr_make_new(sk)) == NULL) { nr_transmit_refusal(skb, 0); -- 2.39.3 (Apple Git-146)