Skip to content

L
linux-davinci
Commit 35a7aa08 authored by Thomas Graf's avatar Thomas Graf Committed by David S. Miller
Browse files
Options

[XFRM] netlink: Rename attribute array from xfrma[] to attrs[] 

Increases readability a lot.
Signed-off-by: default avatarThomas Graf <tgraf@suug.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent fab44899
Hide whitespace changes
Inline Side-by-side
Showing with 94 additions and 94 deletions
net/xfrm/xfrm_user.c
View file @ 35a7aa08
...@@ -38,9 +38,9 @@ static inline int alg_len(struct xfrm_algo *alg) ...@@ -38,9 +38,9 @@ static inline int alg_len(struct xfrm_algo *alg)
return sizeof(*alg) + ((alg->alg_key_len + 7) / 8); return sizeof(*alg) + ((alg->alg_key_len + 7) / 8);
} }
static int verify_one_alg(struct rtattr **xfrma, enum xfrm_attr_type_t type) static int verify_one_alg(struct rtattr **attrs, enum xfrm_attr_type_t type)
{ {
struct rtattr *rt = xfrma[type]; struct rtattr *rt = attrs[type];
struct xfrm_algo *algp; struct xfrm_algo *algp;
if (!rt) if (!rt)
...@@ -75,18 +75,18 @@ static int verify_one_alg(struct rtattr **xfrma, enum xfrm_attr_type_t type) ...@@ -75,18 +75,18 @@ static int verify_one_alg(struct rtattr **xfrma, enum xfrm_attr_type_t type)
return 0; return 0;
} }
static void verify_one_addr(struct rtattr **xfrma, enum xfrm_attr_type_t type, static void verify_one_addr(struct rtattr **attrs, enum xfrm_attr_type_t type,
xfrm_address_t **addrp) xfrm_address_t **addrp)
{ {
struct rtattr *rt = xfrma[type]; struct rtattr *rt = attrs[type];
if (rt && addrp) if (rt && addrp)
*addrp = RTA_DATA(rt); *addrp = RTA_DATA(rt);
} }
static inline int verify_sec_ctx_len(struct rtattr **xfrma) static inline int verify_sec_ctx_len(struct rtattr **attrs)
{ {
struct rtattr *rt = xfrma[XFRMA_SEC_CTX]; struct rtattr *rt = attrs[XFRMA_SEC_CTX];
struct xfrm_user_sec_ctx *uctx; struct xfrm_user_sec_ctx *uctx;
if (!rt) if (!rt)
...@@ -101,7 +101,7 @@ static inline int verify_sec_ctx_len(struct rtattr **xfrma) ...@@ -101,7 +101,7 @@ static inline int verify_sec_ctx_len(struct rtattr **xfrma)
static int verify_newsa_info(struct xfrm_usersa_info *p, static int verify_newsa_info(struct xfrm_usersa_info *p,
struct rtattr **xfrma) struct rtattr **attrs)
{ {
int err; int err;
...@@ -125,35 +125,35 @@ static int verify_newsa_info(struct xfrm_usersa_info *p, ...@@ -125,35 +125,35 @@ static int verify_newsa_info(struct xfrm_usersa_info *p,
err = -EINVAL; err = -EINVAL;
switch (p->id.proto) { switch (p->id.proto) {
case IPPROTO_AH: case IPPROTO_AH:
if (!xfrma[XFRMA_ALG_AUTH] || if (!attrs[XFRMA_ALG_AUTH] ||
xfrma[XFRMA_ALG_CRYPT] || attrs[XFRMA_ALG_CRYPT] ||
xfrma[XFRMA_ALG_COMP]) attrs[XFRMA_ALG_COMP])
goto out; goto out;
break; break;
case IPPROTO_ESP: case IPPROTO_ESP:
if ((!xfrma[XFRMA_ALG_AUTH] && if ((!attrs[XFRMA_ALG_AUTH] &&
!xfrma[XFRMA_ALG_CRYPT]) || !attrs[XFRMA_ALG_CRYPT]) ||
xfrma[XFRMA_ALG_COMP]) attrs[XFRMA_ALG_COMP])
goto out; goto out;
break; break;
case IPPROTO_COMP: case IPPROTO_COMP:
if (!xfrma[XFRMA_ALG_COMP] || if (!attrs[XFRMA_ALG_COMP] ||
xfrma[XFRMA_ALG_AUTH] || attrs[XFRMA_ALG_AUTH] ||
xfrma[XFRMA_ALG_CRYPT]) attrs[XFRMA_ALG_CRYPT])
goto out; goto out;
break; break;
#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
case IPPROTO_DSTOPTS: case IPPROTO_DSTOPTS:
case IPPROTO_ROUTING: case IPPROTO_ROUTING:
if (xfrma[XFRMA_ALG_COMP] || if (attrs[XFRMA_ALG_COMP] ||
xfrma[XFRMA_ALG_AUTH] || attrs[XFRMA_ALG_AUTH] ||
xfrma[XFRMA_ALG_CRYPT] || attrs[XFRMA_ALG_CRYPT] ||
xfrma[XFRMA_ENCAP] || attrs[XFRMA_ENCAP] ||
xfrma[XFRMA_SEC_CTX] || attrs[XFRMA_SEC_CTX] ||
!xfrma[XFRMA_COADDR]) !attrs[XFRMA_COADDR])
goto out; goto out;
break; break;
#endif #endif
...@@ -162,13 +162,13 @@ static int verify_newsa_info(struct xfrm_usersa_info *p, ...@@ -162,13 +162,13 @@ static int verify_newsa_info(struct xfrm_usersa_info *p,
goto out; goto out;
} }
if ((err = verify_one_alg(xfrma, XFRMA_ALG_AUTH))) if ((err = verify_one_alg(attrs, XFRMA_ALG_AUTH)))
goto out; goto out;
if ((err = verify_one_alg(xfrma, XFRMA_ALG_CRYPT))) if ((err = verify_one_alg(attrs, XFRMA_ALG_CRYPT)))
goto out; goto out;
if ((err = verify_one_alg(xfrma, XFRMA_ALG_COMP))) if ((err = verify_one_alg(attrs, XFRMA_ALG_COMP)))
goto out; goto out;
if ((err = verify_sec_ctx_len(xfrma))) if ((err = verify_sec_ctx_len(attrs)))
goto out; goto out;
err = -EINVAL; err = -EINVAL;
...@@ -298,12 +298,12 @@ static void copy_from_user_state(struct xfrm_state *x, struct xfrm_usersa_info * ...@@ -298,12 +298,12 @@ static void copy_from_user_state(struct xfrm_state *x, struct xfrm_usersa_info *
* somehow made shareable and move it to xfrm_state.c - JHS * somehow made shareable and move it to xfrm_state.c - JHS
* *
*/ */
static void xfrm_update_ae_params(struct xfrm_state *x, struct rtattr **xfrma) static void xfrm_update_ae_params(struct xfrm_state *x, struct rtattr **attrs)
{ {
struct rtattr *rp = xfrma[XFRMA_REPLAY_VAL]; struct rtattr *rp = attrs[XFRMA_REPLAY_VAL];
struct rtattr *lt = xfrma[XFRMA_LTIME_VAL]; struct rtattr *lt = attrs[XFRMA_LTIME_VAL];
struct rtattr *et = xfrma[XFRMA_ETIMER_THRESH]; struct rtattr *et = attrs[XFRMA_ETIMER_THRESH];
struct rtattr *rt = xfrma[XFRMA_REPLAY_THRESH]; struct rtattr *rt = attrs[XFRMA_REPLAY_THRESH];
if (rp) { if (rp) {
struct xfrm_replay_state *replay; struct xfrm_replay_state *replay;
...@@ -329,7 +329,7 @@ static void xfrm_update_ae_params(struct xfrm_state *x, struct rtattr **xfrma) ...@@ -329,7 +329,7 @@ static void xfrm_update_ae_params(struct xfrm_state *x, struct rtattr **xfrma)
} }
static struct xfrm_state *xfrm_state_construct(struct xfrm_usersa_info *p, static struct xfrm_state *xfrm_state_construct(struct xfrm_usersa_info *p,
struct rtattr **xfrma, struct rtattr **attrs,
int *errp) int *errp)
{ {
struct xfrm_state *x = xfrm_state_alloc(); struct xfrm_state *x = xfrm_state_alloc();
...@@ -342,25 +342,25 @@ static struct xfrm_state *xfrm_state_construct(struct xfrm_usersa_info *p, ...@@ -342,25 +342,25 @@ static struct xfrm_state *xfrm_state_construct(struct xfrm_usersa_info *p,
if ((err = attach_one_algo(&x->aalg, &x->props.aalgo, if ((err = attach_one_algo(&x->aalg, &x->props.aalgo,
xfrm_aalg_get_byname, xfrm_aalg_get_byname,
xfrma[XFRMA_ALG_AUTH]))) attrs[XFRMA_ALG_AUTH])))
goto error; goto error;
if ((err = attach_one_algo(&x->ealg, &x->props.ealgo, if ((err = attach_one_algo(&x->ealg, &x->props.ealgo,
xfrm_ealg_get_byname, xfrm_ealg_get_byname,
xfrma[XFRMA_ALG_CRYPT]))) attrs[XFRMA_ALG_CRYPT])))
goto error; goto error;
if ((err = attach_one_algo(&x->calg, &x->props.calgo, if ((err = attach_one_algo(&x->calg, &x->props.calgo,
xfrm_calg_get_byname, xfrm_calg_get_byname,
xfrma[XFRMA_ALG_COMP]))) attrs[XFRMA_ALG_COMP])))
goto error; goto error;
if ((err = attach_encap_tmpl(&x->encap, xfrma[XFRMA_ENCAP]))) if ((err = attach_encap_tmpl(&x->encap, attrs[XFRMA_ENCAP])))
goto error; goto error;
if ((err = attach_one_addr(&x->coaddr, xfrma[XFRMA_COADDR]))) if ((err = attach_one_addr(&x->coaddr, attrs[XFRMA_COADDR])))
goto error; goto error;
err = xfrm_init_state(x); err = xfrm_init_state(x);
if (err) if (err)
goto error; goto error;
if ((err = attach_sec_ctx(x, xfrma[XFRMA_SEC_CTX]))) if ((err = attach_sec_ctx(x, attrs[XFRMA_SEC_CTX])))
goto error; goto error;
x->km.seq = p->seq; x->km.seq = p->seq;
...@@ -373,7 +373,7 @@ static struct xfrm_state *xfrm_state_construct(struct xfrm_usersa_info *p, ...@@ -373,7 +373,7 @@ static struct xfrm_state *xfrm_state_construct(struct xfrm_usersa_info *p,
/* override default values from above */ /* override default values from above */
xfrm_update_ae_params(x, (struct rtattr **)xfrma); xfrm_update_ae_params(x, (struct rtattr **)attrs);
return x; return x;
...@@ -386,18 +386,18 @@ error_no_put: ...@@ -386,18 +386,18 @@ error_no_put:
} }
static int xfrm_add_sa(struct sk_buff *skb, struct nlmsghdr *nlh, static int xfrm_add_sa(struct sk_buff *skb, struct nlmsghdr *nlh,
struct rtattr **xfrma) struct rtattr **attrs)
{ {
struct xfrm_usersa_info *p = nlmsg_data(nlh); struct xfrm_usersa_info *p = nlmsg_data(nlh);
struct xfrm_state *x; struct xfrm_state *x;
int err; int err;
struct km_event c; struct km_event c;
err = verify_newsa_info(p, xfrma); err = verify_newsa_info(p, attrs);
if (err) if (err)
return err; return err;
x = xfrm_state_construct(p, xfrma, &err); x = xfrm_state_construct(p, attrs, &err);
if (!x) if (!x)
return err; return err;
...@@ -427,7 +427,7 @@ out: ...@@ -427,7 +427,7 @@ out:
} }
static struct xfrm_state *xfrm_user_state_lookup(struct xfrm_usersa_id *p, static struct xfrm_state *xfrm_user_state_lookup(struct xfrm_usersa_id *p,
struct rtattr **xfrma, struct rtattr **attrs,
int *errp) int *errp)
{ {
struct xfrm_state *x = NULL; struct xfrm_state *x = NULL;
...@@ -439,7 +439,7 @@ static struct xfrm_state *xfrm_user_state_lookup(struct xfrm_usersa_id *p, ...@@ -439,7 +439,7 @@ static struct xfrm_state *xfrm_user_state_lookup(struct xfrm_usersa_id *p,
} else { } else {
xfrm_address_t *saddr = NULL; xfrm_address_t *saddr = NULL;
verify_one_addr(xfrma, XFRMA_SRCADDR, &saddr); verify_one_addr(attrs, XFRMA_SRCADDR, &saddr);
if (!saddr) { if (!saddr) {
err = -EINVAL; err = -EINVAL;
goto out; goto out;
...@@ -457,14 +457,14 @@ static struct xfrm_state *xfrm_user_state_lookup(struct xfrm_usersa_id *p, ...@@ -457,14 +457,14 @@ static struct xfrm_state *xfrm_user_state_lookup(struct xfrm_usersa_id *p,
} }
static int xfrm_del_sa(struct sk_buff *skb, struct nlmsghdr *nlh, static int xfrm_del_sa(struct sk_buff *skb, struct nlmsghdr *nlh,
struct rtattr **xfrma) struct rtattr **attrs)
{ {
struct xfrm_state *x; struct xfrm_state *x;
int err = -ESRCH; int err = -ESRCH;
struct km_event c; struct km_event c;
struct xfrm_usersa_id *p = nlmsg_data(nlh); struct xfrm_usersa_id *p = nlmsg_data(nlh);
x = xfrm_user_state_lookup(p, xfrma, &err); x = xfrm_user_state_lookup(p, attrs, &err);
if (x == NULL) if (x == NULL)
return err; return err;
...@@ -669,7 +669,7 @@ nla_put_failure: ...@@ -669,7 +669,7 @@ nla_put_failure:
} }
static int xfrm_get_spdinfo(struct sk_buff *skb, struct nlmsghdr *nlh, static int xfrm_get_spdinfo(struct sk_buff *skb, struct nlmsghdr *nlh,
struct rtattr **xfrma) struct rtattr **attrs)
{ {
struct sk_buff *r_skb; struct sk_buff *r_skb;
u32 *flags = nlmsg_data(nlh); u32 *flags = nlmsg_data(nlh);
...@@ -722,7 +722,7 @@ nla_put_failure: ...@@ -722,7 +722,7 @@ nla_put_failure:
} }
static int xfrm_get_sadinfo(struct sk_buff *skb, struct nlmsghdr *nlh, static int xfrm_get_sadinfo(struct sk_buff *skb, struct nlmsghdr *nlh,
struct rtattr **xfrma) struct rtattr **attrs)
{ {
struct sk_buff *r_skb; struct sk_buff *r_skb;
u32 *flags = nlmsg_data(nlh); u32 *flags = nlmsg_data(nlh);
...@@ -740,14 +740,14 @@ static int xfrm_get_sadinfo(struct sk_buff *skb, struct nlmsghdr *nlh, ...@@ -740,14 +740,14 @@ static int xfrm_get_sadinfo(struct sk_buff *skb, struct nlmsghdr *nlh,
} }
static int xfrm_get_sa(struct sk_buff *skb, struct nlmsghdr *nlh, static int xfrm_get_sa(struct sk_buff *skb, struct nlmsghdr *nlh,
struct rtattr **xfrma) struct rtattr **attrs)
{ {
struct xfrm_usersa_id *p = nlmsg_data(nlh); struct xfrm_usersa_id *p = nlmsg_data(nlh);
struct xfrm_state *x; struct xfrm_state *x;
struct sk_buff *resp_skb; struct sk_buff *resp_skb;
int err = -ESRCH; int err = -ESRCH;
x = xfrm_user_state_lookup(p, xfrma, &err); x = xfrm_user_state_lookup(p, attrs, &err);
if (x == NULL) if (x == NULL)
goto out_noput; goto out_noput;
...@@ -786,7 +786,7 @@ static int verify_userspi_info(struct xfrm_userspi_info *p) ...@@ -786,7 +786,7 @@ static int verify_userspi_info(struct xfrm_userspi_info *p)
} }
static int xfrm_alloc_userspi(struct sk_buff *skb, struct nlmsghdr *nlh, static int xfrm_alloc_userspi(struct sk_buff *skb, struct nlmsghdr *nlh,
struct rtattr **xfrma) struct rtattr **attrs)
{ {
struct xfrm_state *x; struct xfrm_state *x;
struct xfrm_userspi_info *p; struct xfrm_userspi_info *p;
...@@ -915,9 +915,9 @@ static int verify_newpolicy_info(struct xfrm_userpolicy_info *p) ...@@ -915,9 +915,9 @@ static int verify_newpolicy_info(struct xfrm_userpolicy_info *p)
return verify_policy_dir(p->dir); return verify_policy_dir(p->dir);
} }
static int copy_from_user_sec_ctx(struct xfrm_policy *pol, struct rtattr **xfrma) static int copy_from_user_sec_ctx(struct xfrm_policy *pol, struct rtattr **attrs)
{ {
struct rtattr *rt = xfrma[XFRMA_SEC_CTX]; struct rtattr *rt = attrs[XFRMA_SEC_CTX];
struct xfrm_user_sec_ctx *uctx; struct xfrm_user_sec_ctx *uctx;
if (!rt) if (!rt)
...@@ -983,9 +983,9 @@ static int validate_tmpl(int nr, struct xfrm_user_tmpl *ut, u16 family) ...@@ -983,9 +983,9 @@ static int validate_tmpl(int nr, struct xfrm_user_tmpl *ut, u16 family)
return 0; return 0;
} }
static int copy_from_user_tmpl(struct xfrm_policy *pol, struct rtattr **xfrma) static int copy_from_user_tmpl(struct xfrm_policy *pol, struct rtattr **attrs)
{ {
struct rtattr *rt = xfrma[XFRMA_TMPL]; struct rtattr *rt = attrs[XFRMA_TMPL];
if (!rt) { if (!rt) {
pol->xfrm_nr = 0; pol->xfrm_nr = 0;
...@@ -1003,9 +1003,9 @@ static int copy_from_user_tmpl(struct xfrm_policy *pol, struct rtattr **xfrma) ...@@ -1003,9 +1003,9 @@ static int copy_from_user_tmpl(struct xfrm_policy *pol, struct rtattr **xfrma)
return 0; return 0;
} }
static int copy_from_user_policy_type(u8 *tp, struct rtattr **xfrma) static int copy_from_user_policy_type(u8 *tp, struct rtattr **attrs)
{ {
struct rtattr *rt = xfrma[XFRMA_POLICY_TYPE]; struct rtattr *rt = attrs[XFRMA_POLICY_TYPE];
struct xfrm_userpolicy_type *upt; struct xfrm_userpolicy_type *upt;
u8 type = XFRM_POLICY_TYPE_MAIN; u8 type = XFRM_POLICY_TYPE_MAIN;
int err; int err;
...@@ -1049,7 +1049,7 @@ static void copy_to_user_policy(struct xfrm_policy *xp, struct xfrm_userpolicy_i ...@@ -1049,7 +1049,7 @@ static void copy_to_user_policy(struct xfrm_policy *xp, struct xfrm_userpolicy_i
p->share = XFRM_SHARE_ANY; /* XXX xp->share */ p->share = XFRM_SHARE_ANY; /* XXX xp->share */
} }
static struct xfrm_policy *xfrm_policy_construct(struct xfrm_userpolicy_info *p, struct rtattr **xfrma, int *errp) static struct xfrm_policy *xfrm_policy_construct(struct xfrm_userpolicy_info *p, struct rtattr **attrs, int *errp)
{ {
struct xfrm_policy *xp = xfrm_policy_alloc(GFP_KERNEL); struct xfrm_policy *xp = xfrm_policy_alloc(GFP_KERNEL);
int err; int err;
...@@ -1061,12 +1061,12 @@ static struct xfrm_policy *xfrm_policy_construct(struct xfrm_userpolicy_info *p, ...@@ -1061,12 +1061,12 @@ static struct xfrm_policy *xfrm_policy_construct(struct xfrm_userpolicy_info *p,
copy_from_user_policy(xp, p); copy_from_user_policy(xp, p);
err = copy_from_user_policy_type(&xp->type, xfrma); err = copy_from_user_policy_type(&xp->type, attrs);
if (err) if (err)
goto error; goto error;
if (!(err = copy_from_user_tmpl(xp, xfrma))) if (!(err = copy_from_user_tmpl(xp, attrs)))
err = copy_from_user_sec_ctx(xp, xfrma); err = copy_from_user_sec_ctx(xp, attrs);
if (err) if (err)
goto error; goto error;
...@@ -1078,7 +1078,7 @@ static struct xfrm_policy *xfrm_policy_construct(struct xfrm_userpolicy_info *p, ...@@ -1078,7 +1078,7 @@ static struct xfrm_policy *xfrm_policy_construct(struct xfrm_userpolicy_info *p,
} }
static int xfrm_add_policy(struct sk_buff *skb, struct nlmsghdr *nlh, static int xfrm_add_policy(struct sk_buff *skb, struct nlmsghdr *nlh,
struct rtattr **xfrma) struct rtattr **attrs)
{ {
struct xfrm_userpolicy_info *p = nlmsg_data(nlh); struct xfrm_userpolicy_info *p = nlmsg_data(nlh);
struct xfrm_policy *xp; struct xfrm_policy *xp;
...@@ -1089,11 +1089,11 @@ static int xfrm_add_policy(struct sk_buff *skb, struct nlmsghdr *nlh, ...@@ -1089,11 +1089,11 @@ static int xfrm_add_policy(struct sk_buff *skb, struct nlmsghdr *nlh,
err = verify_newpolicy_info(p); err = verify_newpolicy_info(p);
if (err) if (err)
return err; return err;
err = verify_sec_ctx_len(xfrma); err = verify_sec_ctx_len(attrs);
if (err) if (err)
return err; return err;
xp = xfrm_policy_construct(p, xfrma, &err); xp = xfrm_policy_construct(p, attrs, &err);
if (!xp) if (!xp)
return err; return err;
...@@ -1271,7 +1271,7 @@ static struct sk_buff *xfrm_policy_netlink(struct sk_buff *in_skb, ...@@ -1271,7 +1271,7 @@ static struct sk_buff *xfrm_policy_netlink(struct sk_buff *in_skb,
} }
static int xfrm_get_policy(struct sk_buff *skb, struct nlmsghdr *nlh, static int xfrm_get_policy(struct sk_buff *skb, struct nlmsghdr *nlh,
struct rtattr **xfrma) struct rtattr **attrs)
{ {
struct xfrm_policy *xp; struct xfrm_policy *xp;
struct xfrm_userpolicy_id *p; struct xfrm_userpolicy_id *p;
...@@ -1283,7 +1283,7 @@ static int xfrm_get_policy(struct sk_buff *skb, struct nlmsghdr *nlh, ...@@ -1283,7 +1283,7 @@ static int xfrm_get_policy(struct sk_buff *skb, struct nlmsghdr *nlh,
p = nlmsg_data(nlh); p = nlmsg_data(nlh);
delete = nlh->nlmsg_type == XFRM_MSG_DELPOLICY; delete = nlh->nlmsg_type == XFRM_MSG_DELPOLICY;
err = copy_from_user_policy_type(&type, xfrma); err = copy_from_user_policy_type(&type, attrs);
if (err) if (err)
return err; return err;
...@@ -1294,10 +1294,10 @@ static int xfrm_get_policy(struct sk_buff *skb, struct nlmsghdr *nlh, ...@@ -1294,10 +1294,10 @@ static int xfrm_get_policy(struct sk_buff *skb, struct nlmsghdr *nlh,
if (p->index) if (p->index)
xp = xfrm_policy_byid(type, p->dir, p->index, delete, &err); xp = xfrm_policy_byid(type, p->dir, p->index, delete, &err);
else { else {
struct rtattr *rt = xfrma[XFRMA_SEC_CTX]; struct rtattr *rt = attrs[XFRMA_SEC_CTX];
struct xfrm_policy tmp; struct xfrm_policy tmp;
err = verify_sec_ctx_len(xfrma); err = verify_sec_ctx_len(attrs);
if (err) if (err)
return err; return err;
...@@ -1345,7 +1345,7 @@ out: ...@@ -1345,7 +1345,7 @@ out:
} }
static int xfrm_flush_sa(struct sk_buff *skb, struct nlmsghdr *nlh, static int xfrm_flush_sa(struct sk_buff *skb, struct nlmsghdr *nlh,
struct rtattr **xfrma) struct rtattr **attrs)
{ {
struct km_event c; struct km_event c;
struct xfrm_usersa_flush *p = nlmsg_data(nlh); struct xfrm_usersa_flush *p = nlmsg_data(nlh);
...@@ -1411,7 +1411,7 @@ nla_put_failure: ...@@ -1411,7 +1411,7 @@ nla_put_failure:
} }
static int xfrm_get_ae(struct sk_buff *skb, struct nlmsghdr *nlh, static int xfrm_get_ae(struct sk_buff *skb, struct nlmsghdr *nlh,
struct rtattr **xfrma) struct rtattr **attrs)
{ {
struct xfrm_state *x; struct xfrm_state *x;
struct sk_buff *r_skb; struct sk_buff *r_skb;
...@@ -1449,14 +1449,14 @@ static int xfrm_get_ae(struct sk_buff *skb, struct nlmsghdr *nlh, ...@@ -1449,14 +1449,14 @@ static int xfrm_get_ae(struct sk_buff *skb, struct nlmsghdr *nlh,
} }
static int xfrm_new_ae(struct sk_buff *skb, struct nlmsghdr *nlh, static int xfrm_new_ae(struct sk_buff *skb, struct nlmsghdr *nlh,
struct rtattr **xfrma) struct rtattr **attrs)
{ {
struct xfrm_state *x; struct xfrm_state *x;
struct km_event c; struct km_event c;
int err = - EINVAL; int err = - EINVAL;
struct xfrm_aevent_id *p = nlmsg_data(nlh); struct xfrm_aevent_id *p = nlmsg_data(nlh);
struct rtattr *rp = xfrma[XFRMA_REPLAY_VAL]; struct rtattr *rp = attrs[XFRMA_REPLAY_VAL];
struct rtattr *lt = xfrma[XFRMA_LTIME_VAL]; struct rtattr *lt = attrs[XFRMA_LTIME_VAL];
if (!lt && !rp) if (!lt && !rp)
return err; return err;
...@@ -1473,7 +1473,7 @@ static int xfrm_new_ae(struct sk_buff *skb, struct nlmsghdr *nlh, ...@@ -1473,7 +1473,7 @@ static int xfrm_new_ae(struct sk_buff *skb, struct nlmsghdr *nlh,
goto out; goto out;
spin_lock_bh(&x->lock); spin_lock_bh(&x->lock);
xfrm_update_ae_params(x, xfrma); xfrm_update_ae_params(x, attrs);
spin_unlock_bh(&x->lock); spin_unlock_bh(&x->lock);
c.event = nlh->nlmsg_type; c.event = nlh->nlmsg_type;
...@@ -1488,14 +1488,14 @@ out: ...@@ -1488,14 +1488,14 @@ out:
} }
static int xfrm_flush_policy(struct sk_buff *skb, struct nlmsghdr *nlh, static int xfrm_flush_policy(struct sk_buff *skb, struct nlmsghdr *nlh,
struct rtattr **xfrma) struct rtattr **attrs)
{ {
struct km_event c; struct km_event c;
u8 type = XFRM_POLICY_TYPE_MAIN; u8 type = XFRM_POLICY_TYPE_MAIN;
int err; int err;
struct xfrm_audit audit_info; struct xfrm_audit audit_info;
err = copy_from_user_policy_type(&type, xfrma); err = copy_from_user_policy_type(&type, attrs);
if (err) if (err)
return err; return err;
...@@ -1513,7 +1513,7 @@ static int xfrm_flush_policy(struct sk_buff *skb, struct nlmsghdr *nlh, ...@@ -1513,7 +1513,7 @@ static int xfrm_flush_policy(struct sk_buff *skb, struct nlmsghdr *nlh,
} }
static int xfrm_add_pol_expire(struct sk_buff *skb, struct nlmsghdr *nlh, static int xfrm_add_pol_expire(struct sk_buff *skb, struct nlmsghdr *nlh,
struct rtattr **xfrma) struct rtattr **attrs)
{ {
struct xfrm_policy *xp; struct xfrm_policy *xp;
struct xfrm_user_polexpire *up = nlmsg_data(nlh); struct xfrm_user_polexpire *up = nlmsg_data(nlh);
...@@ -1521,17 +1521,17 @@ static int xfrm_add_pol_expire(struct sk_buff *skb, struct nlmsghdr *nlh, ...@@ -1521,17 +1521,17 @@ static int xfrm_add_pol_expire(struct sk_buff *skb, struct nlmsghdr *nlh,
u8 type = XFRM_POLICY_TYPE_MAIN; u8 type = XFRM_POLICY_TYPE_MAIN;
int err = -ENOENT; int err = -ENOENT;
err = copy_from_user_policy_type(&type, xfrma); err = copy_from_user_policy_type(&type, attrs);
if (err) if (err)
return err; return err;
if (p->index) if (p->index)
xp = xfrm_policy_byid(type, p->dir, p->index, 0, &err); xp = xfrm_policy_byid(type, p->dir, p->index, 0, &err);
else { else {
struct rtattr *rt = xfrma[XFRMA_SEC_CTX]; struct rtattr *rt = attrs[XFRMA_SEC_CTX];
struct xfrm_policy tmp; struct xfrm_policy tmp;
err = verify_sec_ctx_len(xfrma); err = verify_sec_ctx_len(attrs);
if (err) if (err)
return err; return err;
...@@ -1574,7 +1574,7 @@ out: ...@@ -1574,7 +1574,7 @@ out:
} }
static int xfrm_add_sa_expire(struct sk_buff *skb, struct nlmsghdr *nlh, static int xfrm_add_sa_expire(struct sk_buff *skb, struct nlmsghdr *nlh,
struct rtattr **xfrma) struct rtattr **attrs)
{ {
struct xfrm_state *x; struct xfrm_state *x;
int err; int err;
...@@ -1606,12 +1606,12 @@ out: ...@@ -1606,12 +1606,12 @@ out:
} }
static int xfrm_add_acquire(struct sk_buff *skb, struct nlmsghdr *nlh, static int xfrm_add_acquire(struct sk_buff *skb, struct nlmsghdr *nlh,
struct rtattr **xfrma) struct rtattr **attrs)
{ {
struct xfrm_policy *xp; struct xfrm_policy *xp;
struct xfrm_user_tmpl *ut; struct xfrm_user_tmpl *ut;
int i; int i;
struct rtattr *rt = xfrma[XFRMA_TMPL]; struct rtattr *rt = attrs[XFRMA_TMPL];
struct xfrm_user_acquire *ua = nlmsg_data(nlh); struct xfrm_user_acquire *ua = nlmsg_data(nlh);
struct xfrm_state *x = xfrm_state_alloc(); struct xfrm_state *x = xfrm_state_alloc();
...@@ -1628,7 +1628,7 @@ static int xfrm_add_acquire(struct sk_buff *skb, struct nlmsghdr *nlh, ...@@ -1628,7 +1628,7 @@ static int xfrm_add_acquire(struct sk_buff *skb, struct nlmsghdr *nlh,
} }
/* build an XP */ /* build an XP */
xp = xfrm_policy_construct(&ua->policy, (struct rtattr **) xfrma, &err); xp = xfrm_policy_construct(&ua->policy, (struct rtattr **) attrs, &err);
if (!xp) { if (!xp) {
kfree(x); kfree(x);
return err; return err;
...@@ -1661,9 +1661,9 @@ static int xfrm_add_acquire(struct sk_buff *skb, struct nlmsghdr *nlh, ...@@ -1661,9 +1661,9 @@ static int xfrm_add_acquire(struct sk_buff *skb, struct nlmsghdr *nlh,
#ifdef CONFIG_XFRM_MIGRATE #ifdef CONFIG_XFRM_MIGRATE
static int copy_from_user_migrate(struct xfrm_migrate *ma, static int copy_from_user_migrate(struct xfrm_migrate *ma,
struct rtattr **xfrma, int *num) struct rtattr **attrs, int *num)
{ {
struct rtattr *rt = xfrma[XFRMA_MIGRATE]; struct rtattr *rt = attrs[XFRMA_MIGRATE];
struct xfrm_user_migrate *um; struct xfrm_user_migrate *um;
int i, num_migrate; int i, num_migrate;
...@@ -1692,7 +1692,7 @@ static int copy_from_user_migrate(struct xfrm_migrate *ma, ...@@ -1692,7 +1692,7 @@ static int copy_from_user_migrate(struct xfrm_migrate *ma,
} }
static int xfrm_do_migrate(struct sk_buff *skb, struct nlmsghdr *nlh, static int xfrm_do_migrate(struct sk_buff *skb, struct nlmsghdr *nlh,
struct rtattr **xfrma) struct rtattr **attrs)
{ {
struct xfrm_userpolicy_id *pi = nlmsg_data(nlh); struct xfrm_userpolicy_id *pi = nlmsg_data(nlh);
struct xfrm_migrate m[XFRM_MAX_DEPTH]; struct xfrm_migrate m[XFRM_MAX_DEPTH];
...@@ -1700,15 +1700,15 @@ static int xfrm_do_migrate(struct sk_buff *skb, struct nlmsghdr *nlh, ...@@ -1700,15 +1700,15 @@ static int xfrm_do_migrate(struct sk_buff *skb, struct nlmsghdr *nlh,
int err; int err;
int n = 0; int n = 0;
if (xfrma[XFRMA_MIGRATE] == NULL) if (attrs[XFRMA_MIGRATE] == NULL)
return -EINVAL; return -EINVAL;
err = copy_from_user_policy_type(&type, (struct rtattr **)xfrma); err = copy_from_user_policy_type(&type, (struct rtattr **)attrs);
if (err) if (err)
return err; return err;
err = copy_from_user_migrate((struct xfrm_migrate *)m, err = copy_from_user_migrate((struct xfrm_migrate *)m,
(struct rtattr **)xfrma, &n); (struct rtattr **)attrs, &n);
if (err) if (err)
return err; return err;
...@@ -1721,7 +1721,7 @@ static int xfrm_do_migrate(struct sk_buff *skb, struct nlmsghdr *nlh, ...@@ -1721,7 +1721,7 @@ static int xfrm_do_migrate(struct sk_buff *skb, struct nlmsghdr *nlh,
} }
#else #else
static int xfrm_do_migrate(struct sk_buff *skb, struct nlmsghdr *nlh, static int xfrm_do_migrate(struct sk_buff *skb, struct nlmsghdr *nlh,
struct rtattr **xfrma) struct rtattr **attrs)
{ {
return -ENOPROTOOPT; return -ENOPROTOOPT;
} }
...@@ -1882,7 +1882,7 @@ static struct xfrm_link { ...@@ -1882,7 +1882,7 @@ static struct xfrm_link {
static int xfrm_user_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh) static int xfrm_user_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
{ {
struct nlattr *xfrma[XFRMA_MAX+1]; struct nlattr *attrs[XFRMA_MAX+1];
struct xfrm_link *link; struct xfrm_link *link;
int type, err; int type, err;
...@@ -1906,7 +1906,7 @@ static int xfrm_user_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh) ...@@ -1906,7 +1906,7 @@ static int xfrm_user_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
return netlink_dump_start(xfrm_nl, skb, nlh, link->dump, NULL); return netlink_dump_start(xfrm_nl, skb, nlh, link->dump, NULL);
} }
err = nlmsg_parse(nlh, xfrm_msg_min[type], xfrma, XFRMA_MAX, err = nlmsg_parse(nlh, xfrm_msg_min[type], attrs, XFRMA_MAX,
xfrma_policy); xfrma_policy);
if (err < 0) if (err < 0)
return err; return err;
...@@ -1914,7 +1914,7 @@ static int xfrm_user_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh) ...@@ -1914,7 +1914,7 @@ static int xfrm_user_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
if (link->doit == NULL) if (link->doit == NULL)
return -EINVAL; return -EINVAL;
return link->doit(skb, nlh, (struct rtattr **) xfrma); return link->doit(skb, nlh, (struct rtattr **) attrs);
} }
static void xfrm_netlink_rcv(struct sock *sk, int len) static void xfrm_netlink_rcv(struct sock *sk, int len)
......
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