From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F0FFB26738C; Sat, 30 May 2026 18:32:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780165943; cv=none; b=O+TeBoyQVaqHMUyoxM4B+FkBIut9cIzAzHIimVtA33X1IY+0D6aEEQw8gmknd7ue+ubQ5bombMom6szHdmTk+BBM5IztX77tKGayis/ciV6b7npPPSct62827jzSAo4wax+nHd23zHphwL6F7UFXKURcwc8QrA1Z79iMJz+Ryyw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780165943; c=relaxed/simple; bh=2ZMjB7Ynpj3nYtyryukmcsrJN0AwUvwA2qnJCcsXyGw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=OT18GrWJuqUQ3/kZnM4XNZbnhlz16KHUSySpJT90xzdLVDdnXaX2nAEB7DSq11cP1RVXpFsPwULgWgvBhYrMNHYE5cE3klGM2m61AJ2A5KhuSJKtroMr7dGWxAg5wqkhAS1Cit4WHfm4bJvZkUq2jRDUh6KULRTQnQ2DYYERKdk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=W0zP3ssF; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="W0zP3ssF" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 418C41F00893; Sat, 30 May 2026 18:32:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1780165941; bh=QuothSICqMib1gx8sayhD5OYE3PYO8nUwvUbhWyqoFc=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=W0zP3ssFAmVptltTHfV197g1+Uit6ZBA+IbDBYMKj+Lf/HluDxwaZ7/NQkUT35c98 QJxX5RmNocUwyBddDCoZVBRZ/PH6atHkmgbRAi3EODW19yyqJE3lJz/V67pwOLyNm9 VDw1hnQrJV3StKdQJ4MLidrVhRJgbtIdKSeErQyw= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, stable@kernel.org, Yuan Tan , Yifan Wu , Juefei Pu , Xin Liu , Ruijie Li , Ren Wei , Steffen Klassert Subject: [PATCH 5.10 228/589] xfrm: provide message size for XFRM_MSG_MAPPING Date: Sat, 30 May 2026 18:01:49 +0200 Message-ID: <20260530160230.971078542@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260530160224.570625122@linuxfoundation.org> References: <20260530160224.570625122@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Ruijie Li commit 28465227c80fe417b4013c432be1f3737cb9f9a3 upstream. The compat 64=>32 translation path handles XFRM_MSG_MAPPING, but xfrm_msg_min[] does not provide the native payload size for this message type. Add the missing XFRM_MSG_MAPPING entry so compat translation can size and translate mapping notifications correctly. Fixes: 5461fc0c8d9f ("xfrm/compat: Add 64=>32-bit messages translator") Cc: stable@kernel.org Reported-by: Yuan Tan Reported-by: Yifan Wu Reported-by: Juefei Pu Reported-by: Xin Liu Signed-off-by: Ruijie Li Signed-off-by: Ren Wei Signed-off-by: Steffen Klassert Signed-off-by: Greg Kroah-Hartman --- net/xfrm/xfrm_user.c | 1 + 1 file changed, 1 insertion(+) --- a/net/xfrm/xfrm_user.c +++ b/net/xfrm/xfrm_user.c @@ -2727,6 +2727,7 @@ const int xfrm_msg_min[XFRM_NR_MSGTYPES] [XFRM_MSG_GETSADINFO - XFRM_MSG_BASE] = sizeof(u32), [XFRM_MSG_NEWSPDINFO - XFRM_MSG_BASE] = sizeof(u32), [XFRM_MSG_GETSPDINFO - XFRM_MSG_BASE] = sizeof(u32), + [XFRM_MSG_MAPPING - XFRM_MSG_BASE] = XMSGSIZE(xfrm_user_mapping), [XFRM_MSG_SETDEFAULT - XFRM_MSG_BASE] = XMSGSIZE(xfrm_userpolicy_default), [XFRM_MSG_GETDEFAULT - XFRM_MSG_BASE] = XMSGSIZE(xfrm_userpolicy_default), };