hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[XFRM]: Fix aevent structuring to be more complete. 

aevents can not uniquely identify an SA. We break the ABI with this
patch, but consensus is that since it is not yet utilized by any
(known) application then it is fine (better do it now than later).

Signed-off-by: Jamal Hadi Salim <hadi@cyberus.ca>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jamal Hadi Salim 2006-12-02 22:22:25 -08:00 committed by David S. Miller
parent 02dba025b0
commit 2b5f6dcce5
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Documentation/networking/xfrm_sync.txt
View File

@ -47,10 +47,13 @@ aevent_id structure looks like:
struct xfrm_aevent_id { struct xfrm_aevent_id {
struct xfrm_usersa_id sa_id; struct xfrm_usersa_id sa_id;
xfrm_address_t saddr;
__u32 flags; __u32 flags;
__u32 reqid;
}; };
xfrm_usersa_id in this message layout identifies the SA. The unique SA is identified by the combination of xfrm_usersa_id,
reqid and saddr.
flags are used to indicate different things. The possible flags are used to indicate different things. The possible
flags are: flags are:

2
include/linux/xfrm.h
View File

@ -289,7 +289,9 @@ struct xfrm_usersa_id {
struct xfrm_aevent_id { struct xfrm_aevent_id {
struct xfrm_usersa_id sa_id; struct xfrm_usersa_id sa_id;
xfrm_address_t saddr;
__u32 flags; __u32 flags;
__u32 reqid;
}; };
struct xfrm_userspi_info { struct xfrm_userspi_info {

4
net/xfrm/xfrm_user.c
View File

@ -1281,10 +1281,12 @@ static int build_aevent(struct sk_buff *skb, struct xfrm_state *x, struct km_eve
id = NLMSG_DATA(nlh); id = NLMSG_DATA(nlh);
nlh->nlmsg_flags = 0; nlh->nlmsg_flags = 0;
id->sa_id.daddr = x->id.daddr; memcpy(&id->sa_id.daddr, &x->id.daddr,sizeof(x->id.daddr));
id->sa_id.spi = x->id.spi; id->sa_id.spi = x->id.spi;
id->sa_id.family = x->props.family; id->sa_id.family = x->props.family;
id->sa_id.proto = x->id.proto; id->sa_id.proto = x->id.proto;
memcpy(&id->saddr, &x->props.saddr,sizeof(x->props.saddr));
id->reqid = x->props.reqid;
id->flags = c->data.aevent; id->flags = c->data.aevent;
RTA_PUT(skb, XFRMA_REPLAY_VAL, sizeof(x->replay), &x->replay); RTA_PUT(skb, XFRMA_REPLAY_VAL, sizeof(x->replay), &x->replay);