diff options
author | Denis V. Lunev <den@openvz.org> | 2008-04-14 17:47:48 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-04-14 17:47:48 -0400 |
commit | 2c8dd11636e3a5f14a7fb765331b7043f01fe937 (patch) | |
tree | ad264804033c49c507865ecff7f9c61f506debce /net | |
parent | 569508c964a8b5235e00998523bc3acd3f6aff01 (diff) |
[XFRM]: Compilation warnings in xfrm_user.c.
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
03e1ad7b5d871d4189b1da3125c2f12d1b5f7d0b ("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>
Diffstat (limited to 'net')
-rw-r--r-- | net/xfrm/xfrm_user.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c index b822b56e5b8e..1810f5645bb5 100644 --- a/net/xfrm/xfrm_user.c +++ b/net/xfrm/xfrm_user.c | |||
@@ -1343,14 +1343,14 @@ static int xfrm_get_policy(struct sk_buff *skb, struct nlmsghdr *nlh, | |||
1343 | if (err) | 1343 | if (err) |
1344 | return err; | 1344 | return err; |
1345 | 1345 | ||
1346 | ctx = NULL; | ||
1346 | if (rt) { | 1347 | if (rt) { |
1347 | struct xfrm_user_sec_ctx *uctx = nla_data(rt); | 1348 | struct xfrm_user_sec_ctx *uctx = nla_data(rt); |
1348 | 1349 | ||
1349 | err = security_xfrm_policy_alloc(&ctx, uctx); | 1350 | err = security_xfrm_policy_alloc(&ctx, uctx); |
1350 | if (err) | 1351 | if (err) |
1351 | return err; | 1352 | return err; |
1352 | } else | 1353 | } |
1353 | ctx = NULL; | ||
1354 | xp = xfrm_policy_bysel_ctx(type, p->dir, &p->sel, ctx, | 1354 | xp = xfrm_policy_bysel_ctx(type, p->dir, &p->sel, ctx, |
1355 | delete, &err); | 1355 | delete, &err); |
1356 | security_xfrm_policy_free(ctx); | 1356 | security_xfrm_policy_free(ctx); |
@@ -1579,14 +1579,14 @@ static int xfrm_add_pol_expire(struct sk_buff *skb, struct nlmsghdr *nlh, | |||
1579 | if (err) | 1579 | if (err) |
1580 | return err; | 1580 | return err; |
1581 | 1581 | ||
1582 | ctx = NULL; | ||
1582 | if (rt) { | 1583 | if (rt) { |
1583 | struct xfrm_user_sec_ctx *uctx = nla_data(rt); | 1584 | struct xfrm_user_sec_ctx *uctx = nla_data(rt); |
1584 | 1585 | ||
1585 | err = security_xfrm_policy_alloc(&ctx, uctx); | 1586 | err = security_xfrm_policy_alloc(&ctx, uctx); |
1586 | if (err) | 1587 | if (err) |
1587 | return err; | 1588 | return err; |
1588 | } else | 1589 | } |
1589 | ctx = NULL; | ||
1590 | xp = xfrm_policy_bysel_ctx(type, p->dir, &p->sel, ctx, 0, &err); | 1590 | xp = xfrm_policy_bysel_ctx(type, p->dir, &p->sel, ctx, 0, &err); |
1591 | security_xfrm_policy_free(ctx); | 1591 | security_xfrm_policy_free(ctx); |
1592 | } | 1592 | } |