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 BDBC62E92B3; Sat, 30 May 2026 16:59:06 +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=1780160347; cv=none; b=hHGejsGXKgfbK8V8AHQuXmFu/dfhzl6417z/6H1qN9KlJE1GjmVFW/zfSSH70j0kICykeZPCK5iR79r/7G7iLCx2n2KL2kH0AL++YuJGZ11eACnsLywwpoJAMzXp3xeRbajCu77dT6dEHm5Nd84ixCwsC9lC/oAr3y9UqGd20Dg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780160347; c=relaxed/simple; bh=A8lpaAN2dPm6/f/V71rvlANzZGyeWfw7Cw4gszc3Pl4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=m93aIwhPDwiJX/EDG/QSBSKshdayBgL8Wq4DJof6UWIj0MQFs4y7sQf/mi10FLQzewssw+vscloBmOFRzZkFEKIhiG4NAx+n3D/rw/DuxINt7ULX996U2lwtzDjbnBY+Hzv4dBEl7vzG6P5Cptg/DKZ25Dpe/Ha7brzUF9cGrJo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=pcgz/K+7; 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="pcgz/K+7" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0DEAA1F00893; Sat, 30 May 2026 16:59:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1780160346; bh=q6MHOR9o2r9HGrQP+Qr6t+qSFFuVIyVF6NJKTkmOqro=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=pcgz/K+7PnFXlbWOfL4xiQt+69kvSpro2dZkMt4QtnAFAzR55aMl053Ay7nd11fVT B9QwWvWd1B0KkXD3SocIcMxXaxrXG9rWQSsOUNPk6ziFeYEchjMdVj4Hpk9WUtaudH OfYyEP2TvzwLXdSjfzmL5858Bbm05Zy+/URkFOYk= 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 6.1 314/969] xfrm: provide message size for XFRM_MSG_MAPPING Date: Sat, 30 May 2026 17:57:18 +0200 Message-ID: <20260530160309.082084934@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260530160300.485627683@linuxfoundation.org> References: <20260530160300.485627683@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 6.1-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 @@ -2960,6 +2960,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), };