| author | David S. Miller <davem@davemloft.net> | |
| Tue, 22 Jan 2013 19:20:28 +0000 (14:20 -0500) | ||
| committer | David S. Miller <davem@davemloft.net> | |
| Tue, 22 Jan 2013 19:20:28 +0000 (14:20 -0500) | ||
| commit | 0c8729c9b914cc0360ab87171472ca7653b2aa0e | |
| tree | a8b32c48effb4244f6f3e7bd6cc5252c93db9c7e | tree | snapshot (tar.xz tar.gz zip) |
| parent | d84295067fc7e95660d84c014aa528f4409c070d | commit | diff |
| parent | 05ab86c55683410593720003442dde629782aaac | commit | diff |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec
Steffen Klassert says:
====================
1) The transport header did not point to the right place after
esp/ah processing on tunnel mode in the receive path. As a
result, the ECN field of the inner header was not set correctly,
fixes from Li RongQing.
2) We did a null check too late in one of the xfrm_replay advance
functions. This can lead to a division by zero, fix from
Nickolai Zeldovich.
3) The size calculation of the hash table missed the muiltplication
with the actual struct size when the hash table is freed.
We might call the wrong free function, fix from Michal Kubecek.
4) On IPsec pmtu events we can't access the transport headers of
the original packet, so force a relookup for all routes
to notify about the pmtu event.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Steffen Klassert says:
====================
1) The transport header did not point to the right place after
esp/ah processing on tunnel mode in the receive path. As a
result, the ECN field of the inner header was not set correctly,
fixes from Li RongQing.
2) We did a null check too late in one of the xfrm_replay advance
functions. This can lead to a division by zero, fix from
Nickolai Zeldovich.
3) The size calculation of the hash table missed the muiltplication
with the actual struct size when the hash table is freed.
We might call the wrong free function, fix from Michal Kubecek.
4) On IPsec pmtu events we can't access the transport headers of
the original packet, so force a relookup for all routes
to notify about the pmtu event.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>