mirror of
https://github.com/systemd/systemd-stable.git
synced 2025-01-03 01:17:45 +03:00
network: xfrm: refuse zero interface ID
Since kernel 5.17-rc1, 5.16.3, and 5.15.17 (more specifically,8dce439195
) the kernel refuses to create an xfrm interface with zero ID. (cherry picked from commitfd11005951
)
This commit is contained in:
parent
c4357f31da
commit
1ef56ad928
@ -1985,7 +1985,7 @@
|
|||||||
<term><varname>InterfaceId=</varname></term>
|
<term><varname>InterfaceId=</varname></term>
|
||||||
<listitem>
|
<listitem>
|
||||||
<para>Sets the ID/key of the xfrm interface which needs to be associated with a SA/policy.
|
<para>Sets the ID/key of the xfrm interface which needs to be associated with a SA/policy.
|
||||||
Can be decimal or hexadecimal, valid range is 0-0xffffffff, defaults to 0.</para>
|
Can be decimal or hexadecimal, valid range is 1-0xffffffff. This is mandatory.</para>
|
||||||
</listitem>
|
</listitem>
|
||||||
</varlistentry>
|
</varlistentry>
|
||||||
<varlistentry>
|
<varlistentry>
|
||||||
|
@ -14,6 +14,7 @@ static int xfrm_fill_message_create(NetDev *netdev, Link *link, sd_netlink_messa
|
|||||||
|
|
||||||
x = XFRM(netdev);
|
x = XFRM(netdev);
|
||||||
|
|
||||||
|
assert(x);
|
||||||
assert(link || x->independent);
|
assert(link || x->independent);
|
||||||
|
|
||||||
r = sd_netlink_message_append_u32(message, IFLA_XFRM_LINK, link ? link->ifindex : LOOPBACK_IFINDEX);
|
r = sd_netlink_message_append_u32(message, IFLA_XFRM_LINK, link ? link->ifindex : LOOPBACK_IFINDEX);
|
||||||
@ -27,10 +28,28 @@ static int xfrm_fill_message_create(NetDev *netdev, Link *link, sd_netlink_messa
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static int xfrm_verify(NetDev *netdev, const char *filename) {
|
||||||
|
Xfrm *x;
|
||||||
|
|
||||||
|
assert(netdev);
|
||||||
|
assert(filename);
|
||||||
|
|
||||||
|
x = XFRM(netdev);
|
||||||
|
|
||||||
|
assert(x);
|
||||||
|
|
||||||
|
if (x->if_id == 0)
|
||||||
|
return log_netdev_warning_errno(netdev, SYNTHETIC_ERRNO(EINVAL),
|
||||||
|
"%s: Xfrm interface ID cannot be zero.", filename);
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
const NetDevVTable xfrm_vtable = {
|
const NetDevVTable xfrm_vtable = {
|
||||||
.object_size = sizeof(Xfrm),
|
.object_size = sizeof(Xfrm),
|
||||||
.sections = NETDEV_COMMON_SECTIONS "Xfrm\0",
|
.sections = NETDEV_COMMON_SECTIONS "Xfrm\0",
|
||||||
.fill_message_create = xfrm_fill_message_create,
|
.fill_message_create = xfrm_fill_message_create,
|
||||||
|
.config_verify = xfrm_verify,
|
||||||
.create_type = NETDEV_CREATE_STACKED,
|
.create_type = NETDEV_CREATE_STACKED,
|
||||||
.iftype = ARPHRD_NONE,
|
.iftype = ARPHRD_NONE,
|
||||||
};
|
};
|
||||||
|
Loading…
Reference in New Issue
Block a user