From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-yx1-f52.google.com (mail-yx1-f52.google.com [74.125.224.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 AB6353A7F5E for ; Fri, 1 May 2026 13:53:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.224.52 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777643608; cv=none; b=k8OfZwpJtnm0k1aebkWA5P1HhHxhwZsv9IPg3B2mkiNVIRfGeDXPvoNdFgaK+wRL00ZWK3ZqYiosYlDVumxmOU+SEYfH6P2O5iAZqrc+FMdPZcWx0BGmeCxzzPVBOwG6MFPkFhvta5NIcmhkTclgmiPIAqyzB85f6zMxzUaMCac= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777643608; c=relaxed/simple; bh=MefHtGDr3veSG4g4fudZER9OlKLeoj41zMvLE0mmBWg=; h=Date:From:To:Cc:Message-ID:In-Reply-To:References:Subject: Mime-Version:Content-Type; b=qnPvANW7B0lDqMOl+nJZGggW60+Pk3yeUcs8Te2FYUehPHpxI/CluTtCbgqLF9S1pQ+onsi0XT6nVvoKPojpME+08CfI3EWgAl74DeKeKgKsgs2j+p7ayjrEaxcpD7qAk4JUl4NO5y5Lmx8MGrOOYnZFxe8erV9GygSHVYWajcg= 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=SIfmWqJ2; arc=none smtp.client-ip=74.125.224.52 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="SIfmWqJ2" Received: by mail-yx1-f52.google.com with SMTP id 956f58d0204a3-65c24be9e4bso1407470d50.1 for ; Fri, 01 May 2026 06:53:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1777643606; x=1778248406; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:subject:references :in-reply-to:message-id:cc:to:from:date:from:to:cc:subject:date :message-id:reply-to; bh=B26lq8ihVexFKRPs2ffz6ggzVLhTsTx6fPgR3cmx4JI=; b=SIfmWqJ2kaG5UiCP7MnGKCMbaqM/E+vAqQuO9imPzSIoGx6vZoC9tBolwZurpnvnXj /CRrsW6pSChxkw6FsYtKqyTAfABgwFtlw+ZQBAcaIjrb3YMtZ4+qRJvCBlObW/tWiSuV ohFm2qmi2ecyah3cESY3e2gjggwn0ylGCPZ7jby3us1GhecxrbwlMf2FY8uh0a/0Vj7k zIUAj6AkZhy8SmaGQRJ0C/JG7SpXNaGl+DZJhJuo6P9XtlG24aWxoB1D0w+u7dEtzUjc kS9g0+ye41hHrCDpCxqTHwi4wq1Yy/V1t3ljlOBusx5oNHcT3zlMOAvrEkblLuHIH3+n KSGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777643606; x=1778248406; h=content-transfer-encoding:mime-version:subject:references :in-reply-to:message-id:cc:to:from:date:x-gm-gg:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=B26lq8ihVexFKRPs2ffz6ggzVLhTsTx6fPgR3cmx4JI=; b=pCbuKiwUlH7l0yqvn9vWNkWfor1g8+/4HV2DH3JtpQG6iNg5YCsKmC+g435UD9rSkL kDGxxfhx+4pGS1g8GPcN2B7YLbKgivz6Li5QSRyVFv1D1JxED0WJ5DYbTFVDcarsxMR+ 540PK9brYMNOfHQ/V2cT6YHMMcEjVte85Wty5WZ/PEAPBthKL7aAG+KtRlkPtMW/njYE n7yP9bZqGI/hv7s7jaBQ6/u/eE9XNO+bF29pUEtVapiXAfnn5fI2DasEVgBWPxlmTsv7 +jYZL7zWBZAN3l4ieDwTUJ3hcMi/nXRda3CMkRpfPglbUrL5OPmWVwvrqkCjCBD07XNa Q5sw== X-Forwarded-Encrypted: i=1; AFNElJ8zZUI9L/sdCeihdbejr8IyuZ1BgMb3ek0PjHcwkdS5TsjOo24HQBrcf+2/RVtDzQ88z28MxOY=@vger.kernel.org X-Gm-Message-State: AOJu0YznK0lCfVrs70p6Ec0SjK5qxF0oUzaCYK2OEWaD3mJj71Jh6zVP N0VzvrWOZ7FCkJpTd9EXktNW9BOEyEgwBVDgPJKIRIpCt45YJUIGzGLs X-Gm-Gg: AeBDietZNTQSQDCDQ/8ne30FR9DDUpwCagy/RmbLT8vn2pS+a/CurWrpLScngk8rAOz Bo+MgphMIOJQOTevChEad3XmFHKxcCumsn9iHllbtfBu2TGBamnF2+vWgBArNYiDiWLDL/5qD0g wY0Cf8GqVIaooB/RYHW4Bh54mCfaRxEAI1pXLP1RpZ8oRDzMO2ZonAPeBoDFjYSVjsN0EugHMKd qfNQK4F90PDL61KuXeqZrte4uy+aP7TnX6g8J0RYaN7V56yIjIM6me/9Ba4Iqs5mDqwRzkdrubT h5rF+k8/Rk4MmJkRLberV4s6CmHjil/9st99CQkZzzC9yA3mwywQBcVyO+vlA2QvdkDMKl3UTP1 cr67qjNquW+gVLbDZQ09yRjRvN5pB4lnkydC3QYlAN6qte6ZG6Zh6GqIMX7nFo2bSHBBjvVnI63 SpW0ZV/fmhwOmvEd0Okg9+w+C6yIX6FXuyiwfxe66hBvRF0d+NxTPRMlQQRfgH/iOLp1F0fi/cK LsQzabZN7/1u/o= X-Received: by 2002:a53:d14b:0:b0:657:a1d0:992b with SMTP id 956f58d0204a3-65c18f36c6bmr4396849d50.43.1777643605682; Fri, 01 May 2026 06:53:25 -0700 (PDT) Received: from gmail.com (172.235.85.34.bc.googleusercontent.com. [34.85.235.172]) by smtp.gmail.com with ESMTPSA id 956f58d0204a3-65c2e1d95a8sm1192890d50.9.2026.05.01.06.53.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 May 2026 06:53:24 -0700 (PDT) Date: Fri, 01 May 2026 09:53:24 -0400 From: Willem de Bruijn To: David Carlier , daniel.zahka@gmail.com, kuba@kernel.org Cc: willemdebruijn.kernel@gmail.com, davem@davemloft.net, edumazet@google.com, pabeni@redhat.com, horms@kernel.org, raeds@nvidia.com, kees@kernel.org, cratiu@nvidia.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, David Carlier , stable@vger.kernel.org Message-ID: In-Reply-To: <20260501130046.16008-1-devnexen@gmail.com> References: <20260430062033.20428-1-devnexen@gmail.com> <20260501130046.16008-1-devnexen@gmail.com> Subject: Re: [PATCH net v2] psp: strip variable-length PSP header in psp_dev_rcv() Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit David Carlier wrote: > psp_dev_rcv() unconditionally removes a fixed PSP_ENCAP_HLEN, even > when psph->hdrlen indicates that the PSP header carries optional > fields. A frame whose PSP header advertises a non-zero VC or any > extension would therefore be silently mis-decapsulated: option bytes > would spill into the inner packet head and downstream parsing would > fail on a corrupted skb. > > Compute the full PSP header length from psph->hdrlen, pull the > optional bytes into the linear region, and strip the whole header > when decapsulating. Optional fields (VC, ...) are still ignored, > just discarded with the rest of the header instead of leaking. > crypt_offset and the VIRT flag are intentionally not validated here > - callers know their device's PSP implementation and can decide. > > Both in-tree callers gate on hardware-validated PSP, so this is a > correctness fix rather than a reachable corruption path under > current configurations. > > Fixes: 0eddb8023cee ("psp: provide decapsulation and receive helper for drivers") > Suggested-by: Daniel Zahka > Cc: stable@vger.kernel.org > Signed-off-by: David Carlier Reviewed-by: Willem de Bruijn