diff options
| author | Patrick McHardy <kaber@trash.net> | 2005-04-21 20:12:32 -0700 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2005-04-21 20:12:32 -0700 |
| commit | 5c5d281a93e9816966b6131ccec19519dab0e103 (patch) | |
| tree | a897ec464a600d7a678052bfd5e52378470a45fe /net/xfrm/xfrm_state.c | |
| parent | 7938109fff944e0117976a39946d99d2b0b0250d (diff) | |
| download | blackbird-op-linux-5c5d281a93e9816966b6131ccec19519dab0e103.tar.gz blackbird-op-linux-5c5d281a93e9816966b6131ccec19519dab0e103.zip | |
[XFRM]: Fix existence lookup in xfrm_state_find
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>
Diffstat (limited to 'net/xfrm/xfrm_state.c')
| -rw-r--r-- | net/xfrm/xfrm_state.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c index 1db59f11f37d..d11747c2a763 100644 --- a/net/xfrm/xfrm_state.c +++ b/net/xfrm/xfrm_state.c @@ -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; |
