Skip to content

Commit

Permalink
[XFRM]: Fix existence lookup in xfrm_state_find
Browse files Browse the repository at this point in the history
Use 'daddr' instead of &tmpl->id.daddr, since the latter
might be zero.  Also, only perform the lookup when
tmpl->id.spi is non-zero.

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Patrick McHardy authored and David S. Miller committed Apr 22, 2005
1 parent 7938109 commit 5c5d281
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions net/xfrm/xfrm_state.c
Original file line number Diff line number Diff line change
Expand Up @@ -357,8 +357,9 @@ xfrm_state_find(xfrm_address_t *daddr, xfrm_address_t *saddr,

x = best;
if (!x && !error && !acquire_in_progress) {
x0 = afinfo->state_lookup(&tmpl->id.daddr, tmpl->id.spi, tmpl->id.proto);
if (x0 != NULL) {
if (tmpl->id.spi &&
(x0 = afinfo->state_lookup(daddr, tmpl->id.spi,
tmpl->id.proto)) != NULL) {
xfrm_state_put(x0);
error = -EEXIST;
goto out;
Expand Down

0 comments on commit 5c5d281

Please sign in to comment.