Skip to content

L
linux
Commit 183cad12 authored by David S. Miller's avatar David S. Miller
Browse files
Options

xfrm: Const'ify pointer args to km_migrate() and implementations. 

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent dd701754
Show whitespace changes
Inline Side-by-side
Showing with 34 additions and 30 deletions
include/net/xfrm.h
View file @ 183cad12
...@@ -556,7 +556,11 @@ struct xfrm_mgr { ...@@ -556,7 +556,11 @@ struct xfrm_mgr {
int (*new_mapping)(struct xfrm_state *x, xfrm_address_t *ipaddr, __be16 sport); int (*new_mapping)(struct xfrm_state *x, xfrm_address_t *ipaddr, __be16 sport);
int (*notify_policy)(struct xfrm_policy *x, int dir, const struct km_event *c); int (*notify_policy)(struct xfrm_policy *x, int dir, const struct km_event *c);
int (*report)(struct net *net, u8 proto, struct xfrm_selector *sel, xfrm_address_t *addr); int (*report)(struct net *net, u8 proto, struct xfrm_selector *sel, xfrm_address_t *addr);
int (*migrate)(struct xfrm_selector *sel, u8 dir, u8 type, struct xfrm_migrate *m, int num_bundles, struct xfrm_kmaddress *k); int (*migrate)(const struct xfrm_selector *sel,
u8 dir, u8 type,
const struct xfrm_migrate *m,
int num_bundles,
const struct xfrm_kmaddress *k);
}; };
extern int xfrm_register_km(struct xfrm_mgr *km); extern int xfrm_register_km(struct xfrm_mgr *km);
...@@ -1483,9 +1487,9 @@ struct xfrm_state *xfrm_find_acq(struct net *net, struct xfrm_mark *mark, ...@@ -1483,9 +1487,9 @@ struct xfrm_state *xfrm_find_acq(struct net *net, struct xfrm_mark *mark,
extern int xfrm_sk_policy_insert(struct sock *sk, int dir, struct xfrm_policy *pol); extern int xfrm_sk_policy_insert(struct sock *sk, int dir, struct xfrm_policy *pol);
#ifdef CONFIG_XFRM_MIGRATE #ifdef CONFIG_XFRM_MIGRATE
extern int km_migrate(struct xfrm_selector *sel, u8 dir, u8 type, extern int km_migrate(const struct xfrm_selector *sel, u8 dir, u8 type,
struct xfrm_migrate *m, int num_bundles, const struct xfrm_migrate *m, int num_bundles,
struct xfrm_kmaddress *k); const struct xfrm_kmaddress *k);
extern struct xfrm_state * xfrm_migrate_state_find(struct xfrm_migrate *m); extern struct xfrm_state * xfrm_migrate_state_find(struct xfrm_migrate *m);
extern struct xfrm_state * xfrm_state_migrate(struct xfrm_state *x, extern struct xfrm_state * xfrm_state_migrate(struct xfrm_state *x,
struct xfrm_migrate *m); struct xfrm_migrate *m);
......
net/key/af_key.c
View file @ 183cad12
...@@ -690,7 +690,7 @@ static inline int pfkey_mode_to_xfrm(int mode) ...@@ -690,7 +690,7 @@ static inline int pfkey_mode_to_xfrm(int mode)
} }
} }
static unsigned int pfkey_sockaddr_fill(xfrm_address_t *xaddr, __be16 port, static unsigned int pfkey_sockaddr_fill(const xfrm_address_t *xaddr, __be16 port,
struct sockaddr *sa, struct sockaddr *sa,
unsigned short family) unsigned short family)
{ {
...@@ -3318,7 +3318,7 @@ static int pfkey_send_new_mapping(struct xfrm_state *x, xfrm_address_t *ipaddr, ...@@ -3318,7 +3318,7 @@ static int pfkey_send_new_mapping(struct xfrm_state *x, xfrm_address_t *ipaddr,
#ifdef CONFIG_NET_KEY_MIGRATE #ifdef CONFIG_NET_KEY_MIGRATE
static int set_sadb_address(struct sk_buff *skb, int sasize, int type, static int set_sadb_address(struct sk_buff *skb, int sasize, int type,
struct xfrm_selector *sel) const struct xfrm_selector *sel)
{ {
struct sadb_address *addr; struct sadb_address *addr;
addr = (struct sadb_address *)skb_put(skb, sizeof(struct sadb_address) + sasize); addr = (struct sadb_address *)skb_put(skb, sizeof(struct sadb_address) + sasize);
...@@ -3348,7 +3348,7 @@ static int set_sadb_address(struct sk_buff *skb, int sasize, int type, ...@@ -3348,7 +3348,7 @@ static int set_sadb_address(struct sk_buff *skb, int sasize, int type,
} }
static int set_sadb_kmaddress(struct sk_buff *skb, struct xfrm_kmaddress *k) static int set_sadb_kmaddress(struct sk_buff *skb, const struct xfrm_kmaddress *k)
{ {
struct sadb_x_kmaddress *kma; struct sadb_x_kmaddress *kma;
u8 *sa; u8 *sa;
...@@ -3376,7 +3376,7 @@ static int set_sadb_kmaddress(struct sk_buff *skb, struct xfrm_kmaddress *k) ...@@ -3376,7 +3376,7 @@ static int set_sadb_kmaddress(struct sk_buff *skb, struct xfrm_kmaddress *k)
static int set_ipsecrequest(struct sk_buff *skb, static int set_ipsecrequest(struct sk_buff *skb,
uint8_t proto, uint8_t mode, int level, uint8_t proto, uint8_t mode, int level,
uint32_t reqid, uint8_t family, uint32_t reqid, uint8_t family,
xfrm_address_t *src, xfrm_address_t *dst) const xfrm_address_t *src, const xfrm_address_t *dst)
{ {
struct sadb_x_ipsecrequest *rq; struct sadb_x_ipsecrequest *rq;
u8 *sa; u8 *sa;
...@@ -3404,9 +3404,9 @@ static int set_ipsecrequest(struct sk_buff *skb, ...@@ -3404,9 +3404,9 @@ static int set_ipsecrequest(struct sk_buff *skb,
#endif #endif
#ifdef CONFIG_NET_KEY_MIGRATE #ifdef CONFIG_NET_KEY_MIGRATE
static int pfkey_send_migrate(struct xfrm_selector *sel, u8 dir, u8 type, static int pfkey_send_migrate(const struct xfrm_selector *sel, u8 dir, u8 type,
struct xfrm_migrate *m, int num_bundles, const struct xfrm_migrate *m, int num_bundles,
struct xfrm_kmaddress *k) const struct xfrm_kmaddress *k)
{ {
int i; int i;
int sasize_sel; int sasize_sel;
...@@ -3415,7 +3415,7 @@ static int pfkey_send_migrate(struct xfrm_selector *sel, u8 dir, u8 type, ...@@ -3415,7 +3415,7 @@ static int pfkey_send_migrate(struct xfrm_selector *sel, u8 dir, u8 type,
struct sk_buff *skb; struct sk_buff *skb;
struct sadb_msg *hdr; struct sadb_msg *hdr;
struct sadb_x_policy *pol; struct sadb_x_policy *pol;
struct xfrm_migrate *mp; const struct xfrm_migrate *mp;
if (type != XFRM_POLICY_TYPE_MAIN) if (type != XFRM_POLICY_TYPE_MAIN)
return 0; return 0;
...@@ -3513,9 +3513,9 @@ static int pfkey_send_migrate(struct xfrm_selector *sel, u8 dir, u8 type, ...@@ -3513,9 +3513,9 @@ static int pfkey_send_migrate(struct xfrm_selector *sel, u8 dir, u8 type,
return -EINVAL; return -EINVAL;
} }
#else #else
static int pfkey_send_migrate(struct xfrm_selector *sel, u8 dir, u8 type, static int pfkey_send_migrate(const struct xfrm_selector *sel, u8 dir, u8 type,
struct xfrm_migrate *m, int num_bundles, const struct xfrm_migrate *m, int num_bundles,
struct xfrm_kmaddress *k) const struct xfrm_kmaddress *k)
{ {
return -ENOPROTOOPT; return -ENOPROTOOPT;
} }
......
net/xfrm/xfrm_state.c
View file @ 183cad12
...@@ -1819,9 +1819,9 @@ void km_policy_expired(struct xfrm_policy *pol, int dir, int hard, u32 pid) ...@@ -1819,9 +1819,9 @@ void km_policy_expired(struct xfrm_policy *pol, int dir, int hard, u32 pid)
EXPORT_SYMBOL(km_policy_expired); EXPORT_SYMBOL(km_policy_expired);
#ifdef CONFIG_XFRM_MIGRATE #ifdef CONFIG_XFRM_MIGRATE
int km_migrate(struct xfrm_selector *sel, u8 dir, u8 type, int km_migrate(const struct xfrm_selector *sel, u8 dir, u8 type,
struct xfrm_migrate *m, int num_migrate, const struct xfrm_migrate *m, int num_migrate,
struct xfrm_kmaddress *k) const struct xfrm_kmaddress *k)
{ {
int err = -EINVAL; int err = -EINVAL;
int ret; int ret;
......
net/xfrm/xfrm_user.c
View file @ 183cad12
...@@ -1986,7 +1986,7 @@ static int xfrm_do_migrate(struct sk_buff *skb, struct nlmsghdr *nlh, ...@@ -1986,7 +1986,7 @@ static int xfrm_do_migrate(struct sk_buff *skb, struct nlmsghdr *nlh,
#endif #endif
#ifdef CONFIG_XFRM_MIGRATE #ifdef CONFIG_XFRM_MIGRATE
static int copy_to_user_migrate(struct xfrm_migrate *m, struct sk_buff *skb) static int copy_to_user_migrate(const struct xfrm_migrate *m, struct sk_buff *skb)
{ {
struct xfrm_user_migrate um; struct xfrm_user_migrate um;
...@@ -2004,7 +2004,7 @@ static int copy_to_user_migrate(struct xfrm_migrate *m, struct sk_buff *skb) ...@@ -2004,7 +2004,7 @@ static int copy_to_user_migrate(struct xfrm_migrate *m, struct sk_buff *skb)
return nla_put(skb, XFRMA_MIGRATE, sizeof(um), &um); return nla_put(skb, XFRMA_MIGRATE, sizeof(um), &um);
} }
static int copy_to_user_kmaddress(struct xfrm_kmaddress *k, struct sk_buff *skb) static int copy_to_user_kmaddress(const struct xfrm_kmaddress *k, struct sk_buff *skb)
{ {
struct xfrm_user_kmaddress uk; struct xfrm_user_kmaddress uk;
...@@ -2025,11 +2025,11 @@ static inline size_t xfrm_migrate_msgsize(int num_migrate, int with_kma) ...@@ -2025,11 +2025,11 @@ static inline size_t xfrm_migrate_msgsize(int num_migrate, int with_kma)
+ userpolicy_type_attrsize(); + userpolicy_type_attrsize();
} }
static int build_migrate(struct sk_buff *skb, struct xfrm_migrate *m, static int build_migrate(struct sk_buff *skb, const struct xfrm_migrate *m,
int num_migrate, struct xfrm_kmaddress *k, int num_migrate, const struct xfrm_kmaddress *k,
struct xfrm_selector *sel, u8 dir, u8 type) const struct xfrm_selector *sel, u8 dir, u8 type)
{ {
struct xfrm_migrate *mp; const struct xfrm_migrate *mp;
struct xfrm_userpolicy_id *pol_id; struct xfrm_userpolicy_id *pol_id;
struct nlmsghdr *nlh; struct nlmsghdr *nlh;
int i; int i;
...@@ -2061,9 +2061,9 @@ static int build_migrate(struct sk_buff *skb, struct xfrm_migrate *m, ...@@ -2061,9 +2061,9 @@ static int build_migrate(struct sk_buff *skb, struct xfrm_migrate *m,
return -EMSGSIZE; return -EMSGSIZE;
} }
static int xfrm_send_migrate(struct xfrm_selector *sel, u8 dir, u8 type, static int xfrm_send_migrate(const struct xfrm_selector *sel, u8 dir, u8 type,
struct xfrm_migrate *m, int num_migrate, const struct xfrm_migrate *m, int num_migrate,
struct xfrm_kmaddress *k) const struct xfrm_kmaddress *k)
{ {
struct net *net = &init_net; struct net *net = &init_net;
struct sk_buff *skb; struct sk_buff *skb;
...@@ -2079,9 +2079,9 @@ static int xfrm_send_migrate(struct xfrm_selector *sel, u8 dir, u8 type, ...@@ -2079,9 +2079,9 @@ static int xfrm_send_migrate(struct xfrm_selector *sel, u8 dir, u8 type,
return nlmsg_multicast(net->xfrm.nlsk, skb, 0, XFRMNLGRP_MIGRATE, GFP_ATOMIC); return nlmsg_multicast(net->xfrm.nlsk, skb, 0, XFRMNLGRP_MIGRATE, GFP_ATOMIC);
} }
#else #else
static int xfrm_send_migrate(struct xfrm_selector *sel, u8 dir, u8 type, static int xfrm_send_migrate(const struct xfrm_selector *sel, u8 dir, u8 type,
struct xfrm_migrate *m, int num_migrate, const struct xfrm_migrate *m, int num_migrate,
struct xfrm_kmaddress *k) const struct xfrm_kmaddress *k)
{ {
return -ENOPROTOOPT; return -ENOPROTOOPT;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7