| Message ID | 20210901153407.GA20446@asgard.redhat.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | include/uapi/linux/xfrm.h: Fix XFRM_MSG_MAPPING ABI breakage | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Not a local patch |
Le 01/09/2021 à 17:34, Eugene Syromiatnikov a écrit : > Commit 2d151d39073a ("xfrm: Add possibility to set the default to block > if we have no policy") broke ABI by changing the value of the XFRM_MSG_MAPPING > enum item. Fix it by placing XFRM_MSG_SETDEFAULT/XFRM_MSG_GETDEFAULT > to the end of the enum, right before __XFRM_MSG_MAX. > > Fixes: 2d151d39073a ("xfrm: Add possibility to set the default to block if we have no policy") > Signed-off-by: Eugene Syromiatnikov <esyr@redhat.com> Acked-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
On Wed, Sep 01, 2021 at 05:34:07PM +0200, Eugene Syromiatnikov wrote: > Commit 2d151d39073a ("xfrm: Add possibility to set the default to block > if we have no policy") broke ABI by changing the value of the XFRM_MSG_MAPPING > enum item. Fix it by placing XFRM_MSG_SETDEFAULT/XFRM_MSG_GETDEFAULT > to the end of the enum, right before __XFRM_MSG_MAX. > > Fixes: 2d151d39073a ("xfrm: Add possibility to set the default to block if we have no policy") > Signed-off-by: Eugene Syromiatnikov <esyr@redhat.com> References: https://lore.kernel.org/netdev/20210901151402.GA2557@altlinux.org/ Reviewed-by: Dmitry V. Levin <ldv@altlinux.org>
diff --git a/include/uapi/linux/xfrm.h b/include/uapi/linux/xfrm.h index b96c1ea..26f456b1 100644 --- a/include/uapi/linux/xfrm.h +++ b/include/uapi/linux/xfrm.h @@ -213,13 +213,13 @@ enum { XFRM_MSG_GETSPDINFO, #define XFRM_MSG_GETSPDINFO XFRM_MSG_GETSPDINFO + XFRM_MSG_MAPPING, +#define XFRM_MSG_MAPPING XFRM_MSG_MAPPING + XFRM_MSG_SETDEFAULT, #define XFRM_MSG_SETDEFAULT XFRM_MSG_SETDEFAULT XFRM_MSG_GETDEFAULT, #define XFRM_MSG_GETDEFAULT XFRM_MSG_GETDEFAULT - - XFRM_MSG_MAPPING, -#define XFRM_MSG_MAPPING XFRM_MSG_MAPPING __XFRM_MSG_MAX }; #define XFRM_MSG_MAX (__XFRM_MSG_MAX - 1)
Commit 2d151d39073a ("xfrm: Add possibility to set the default to block if we have no policy") broke ABI by changing the value of the XFRM_MSG_MAPPING enum item. Fix it by placing XFRM_MSG_SETDEFAULT/XFRM_MSG_GETDEFAULT to the end of the enum, right before __XFRM_MSG_MAX. Fixes: 2d151d39073a ("xfrm: Add possibility to set the default to block if we have no policy") Signed-off-by: Eugene Syromiatnikov <esyr@redhat.com> --- include/uapi/linux/xfrm.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)