|
@@ -2356,7 +2356,7 @@ static int pfkey_spddelete(struct sock *sk, struct sk_buff *skb, struct sadb_msg
|
|
struct xfrm_selector sel;
|
|
struct xfrm_selector sel;
|
|
struct km_event c;
|
|
struct km_event c;
|
|
struct sadb_x_sec_ctx *sec_ctx;
|
|
struct sadb_x_sec_ctx *sec_ctx;
|
|
- struct xfrm_sec_ctx *pol_ctx;
|
|
|
|
|
|
+ struct xfrm_sec_ctx *pol_ctx = NULL;
|
|
|
|
|
|
if (!present_and_same_family(ext_hdrs[SADB_EXT_ADDRESS_SRC-1],
|
|
if (!present_and_same_family(ext_hdrs[SADB_EXT_ADDRESS_SRC-1],
|
|
ext_hdrs[SADB_EXT_ADDRESS_DST-1]) ||
|
|
ext_hdrs[SADB_EXT_ADDRESS_DST-1]) ||
|
|
@@ -2396,8 +2396,7 @@ static int pfkey_spddelete(struct sock *sk, struct sk_buff *skb, struct sadb_msg
|
|
kfree(uctx);
|
|
kfree(uctx);
|
|
if (err)
|
|
if (err)
|
|
return err;
|
|
return err;
|
|
- } else
|
|
|
|
- pol_ctx = NULL;
|
|
|
|
|
|
+ }
|
|
|
|
|
|
xp = xfrm_policy_bysel_ctx(XFRM_POLICY_TYPE_MAIN,
|
|
xp = xfrm_policy_bysel_ctx(XFRM_POLICY_TYPE_MAIN,
|
|
pol->sadb_x_policy_dir - 1, &sel, pol_ctx,
|
|
pol->sadb_x_policy_dir - 1, &sel, pol_ctx,
|