From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-qk1-f177.google.com (mail-qk1-f177.google.com [209.85.222.177]) (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 9CA263CCFBD for ; Fri, 15 May 2026 15:17:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.177 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778858258; cv=none; b=Bdw5hG7UxALqLU9gM3/Cyxxa5D1sADU+bBPeZySSPqCtPwzkFQypuXerc/QrS+vlpgQ9sGtUTtqxb+L41RFARp3LEqpGdp41r1gHPAOtGqvijVqrpFYSzJ+sEX9Xo++ObSqlt8bY6Le2u+aVtLvcr1WZbDX/4aiFhDJPi1BxfiE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778858258; c=relaxed/simple; bh=u6jb9Fs1k5nZrvjQt4XNUqnejmYfiJ3UGsEMQ5UICJY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=m499IJyRm/paJV1kGCda0qOspzRR/+6ewEA2iw+P3aRHPNdOnczVhCY01EWUeQ4mi0qcDyQuo2B5bYzbTE7AejTGCzkwnT6pfcOxyCAQrRaX9SuFPXmpTHgPLQ/6iNCJhdWV7X/tVs3X4arfPXLXxXOelv7CJeA28WGgjPczuGo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=gY4y2UeF; arc=none smtp.client-ip=209.85.222.177 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="gY4y2UeF" Received: by mail-qk1-f177.google.com with SMTP id af79cd13be357-9125d2a4d36so45807185a.3 for ; Fri, 15 May 2026 08:17:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1778858254; x=1779463054; darn=vger.kernel.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; bh=6HI+46hroiLUB5E9BmVjlUPUfW8yVSnW31LUwOO9Kjc=; b=gY4y2UeF0xk+cCnO6b/FLsOWoDWlSBIteQ7sgmv/DtAUZXNcbyyknYrhJ4a13kFchV z1DAiAzsXyci0YJw2Qk57REBS1f4v+BnjJ1K1/lwjXTmKh3CdY5Rfu6a9qOdZokVsObr QwL49ph0iY19Y6s6hAzTRM2yqiJH5QbWZZA7kVw8qEAbt63j5d9Nhrsv4rfjWHELO2ps 9Zc0GTxPvoEljw7MhBJa6vGvdoYS4kBQQUnZZBbjBPVxKdcIvrBUyP81dIrj2OFXMem9 Bcdrgn619ukBZeJlAdzUrH0UesFoFst0LuDPIPbcxIlv9B+AzykCtRpAUWmS+HWgOpif iBsw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778858254; x=1779463054; 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; bh=6HI+46hroiLUB5E9BmVjlUPUfW8yVSnW31LUwOO9Kjc=; b=Qr+CbyOtRttgLLkLTMq86jyiRW4sZUrpcTFLdDp1PL/hcGDX/fvrtiDXcyBROOjWRZ j0grojboNYat21I37hlVNkMY7uxz7Aa0wUBZh9zlF1RnfYBmUk9/cWqsynYMlCV8JKSu PiFtcXBM55HNbUUsF9BP6Mk/88y0nAheM7i+owauXcWkRNdiK8pBJ4sR0P9DG0OAOvgn pH0zby+9v58GBUc1sELBF+rIUlHCv1xY+72D4rJPJipwX4wUMawzu5S1Dh4kC+XzYOnW YPcRckBgctKpWG9a8ZembCpj31FgUzUvAK0XjVne+c+YyagmCqelWq/cEAM3bm7bMlGq CxLg== X-Forwarded-Encrypted: i=1; AFNElJ8ROdaa5iBfA0fK4KwkvMf8pmBPe7R/y1DyV3Q5SHLzQ3VFZbL30/uYxrgXlwWlT7kfunGHEWc8+OGziBo=@vger.kernel.org X-Gm-Message-State: AOJu0YzM9lKtplizb8KnuGUHeWSCmc3XLlu0EH2PDFNYBrWeQqq0G1S7 1Urz8skjYl6JWYJZ94JbPG+GIZbnEl+twuFuYrJPqEOi7rAo+k3N564581/Rqb9j X-Gm-Gg: Acq92OFhcHGlqScDcvVgmPe8h53AzvXHYQftZ/iOZ8Ns4lpHuFExToVBT7nfSHvOraR gNGeTRwJAk+uFYX7SWSM7ItDbsam3u1486BYsQe/4KQP67ZbRT//2IUFmU+duPKtUlwst+qatah d3S0Jfy6En4yuvVUeEiKBc8Ax5DVaLX0F0NCie/dkS7KcDeXqWk8eHk5+xao5tXuW2sGKYB731f zPIqlctdXQsLp7uToJ9oTUEbQCAbEOJzANUBQ3hmrSwWpsxZ78Jk+CWFJHzodIecCU2ykF0ZsNJ 6qcZmKBXtr8hTQbDrjLwt6SUZ0ZzAX/MTV9PsSCEVa0jumLn1TMXFlv6hd59+VhApVcAf6PwMZ3 LAEey2Al4k2WW70QcD2fKGfUlb539mX1WI1c4QZE11CtXkPr29ehAbnXK54mOjBSt0bqiXV9cHZ qhVoWE1fmLg/Mfkz8PHQL/fxO1JEZbJPx/czXtUvBbgJDgKKtr++MA5cO43gs0iMNCIImOJ2BTm mOp/SCyIx2r00940InDid64EsJjipKUBIwAWOmVj2E= X-Received: by 2002:a05:620a:2302:20b0:911:f0ff:3d21 with SMTP id af79cd13be357-911f10e8471mr474266085a.37.1778858253882; Fri, 15 May 2026 08:17:33 -0700 (PDT) Received: from server0.tail6e7dd.ts.net (c-68-48-65-54.hsd1.mi.comcast.net. [68.48.65.54]) by smtp.gmail.com with ESMTPSA id af79cd13be357-910ba36e638sm569877385a.9.2026.05.15.08.17.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 May 2026 08:17:33 -0700 (PDT) From: Michael Bommarito To: Johannes Berg Cc: Ayala Beker , linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH wireless 1/2] wifi: mac80211: consume only present negotiated TTLM maps Date: Fri, 15 May 2026 11:17:18 -0400 Message-ID: <20260515151719.1317659-2-michael.bommarito@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260515151719.1317659-1-michael.bommarito@gmail.com> References: <20260515151719.1317659-1-michael.bommarito@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 7bit ieee80211_tid_to_link_map_size_ok() validates negotiated TTLM elements against the number of link-map entries indicated by link_map_presence. ieee80211_parse_neg_ttlm() must consume the same layout. The parser advanced its cursor for every TID, including TIDs whose presence bit is clear and therefore have no map bytes in the element. A sparse map can then make a later present TID read past the validated element. The bad bytes land in neg_ttlm->{up,down}link[tid] but are gated by valid_links before being applied to driver state, so a peer cannot turn the read into a policy change. Under KUnit + KASAN with an exact-sized element allocation the OOB read is reported as a slab-out-of-bounds; whether the same trigger fires under the production RX path depends on surrounding allocator state. Advance the cursor only when the current TID has a map present. Fixes: 8f500fbc6c65 ("wifi: mac80211: process and save negotiated TID to Link mapping request") Cc: stable@vger.kernel.org Assisted-by: Claude:claude-opus-4-7 Signed-off-by: Michael Bommarito --- net/mac80211/mlme.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index 160ae65a5c645..c3a2844740a14 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c @@ -8155,6 +8155,7 @@ ieee80211_parse_neg_ttlm(struct ieee80211_sub_if_data *sdata, "No active links for TID %d", tid); return -EINVAL; } + pos += map_size; } else { map = 0; } @@ -8173,7 +8174,6 @@ ieee80211_parse_neg_ttlm(struct ieee80211_sub_if_data *sdata, default: return -EINVAL; } - pos += map_size; } return 0; } -- 2.53.0