Skip to content

Commit

Permalink
[XFRM]: Compilation warnings in xfrm_user.c.
Browse files Browse the repository at this point in the history
When CONFIG_SECURITY_NETWORK_XFRM is undefined the following warnings appears:
net/xfrm/xfrm_user.c: In function 'xfrm_add_pol_expire':
net/xfrm/xfrm_user.c:1576: warning: 'ctx' may be used uninitialized in this function
net/xfrm/xfrm_user.c: In function 'xfrm_get_policy':
net/xfrm/xfrm_user.c:1340: warning: 'ctx' may be used uninitialized in this function
(security_xfrm_policy_alloc is noop for the case).

It seems that they are result of the commit
03e1ad7 ("LSM: Make the Labeled IPsec
hooks more stack friendly")

Signed-off-by: Denis V. Lunev <den@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Denis V. Lunev authored and David S. Miller committed Apr 14, 2008
1 parent 569508c commit 2c8dd11
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions net/xfrm/xfrm_user.c
Original file line number Diff line number Diff line change
Expand Up @@ -1343,14 +1343,14 @@ static int xfrm_get_policy(struct sk_buff *skb, struct nlmsghdr *nlh,
if (err)
return err;

ctx = NULL;
if (rt) {
struct xfrm_user_sec_ctx *uctx = nla_data(rt);

err = security_xfrm_policy_alloc(&ctx, uctx);
if (err)
return err;
} else
ctx = NULL;
}
xp = xfrm_policy_bysel_ctx(type, p->dir, &p->sel, ctx,
delete, &err);
security_xfrm_policy_free(ctx);
Expand Down Expand Up @@ -1579,14 +1579,14 @@ static int xfrm_add_pol_expire(struct sk_buff *skb, struct nlmsghdr *nlh,
if (err)
return err;

ctx = NULL;
if (rt) {
struct xfrm_user_sec_ctx *uctx = nla_data(rt);

err = security_xfrm_policy_alloc(&ctx, uctx);
if (err)
return err;
} else
ctx = NULL;
}
xp = xfrm_policy_bysel_ctx(type, p->dir, &p->sel, ctx, 0, &err);
security_xfrm_policy_free(ctx);
}
Expand Down

0 comments on commit 2c8dd11

Please sign in to comment.