diff mbox

[dpdk-dev] examples/ipsec-secgw: fix ip version check

Message ID 1507899009-20393-1-git-send-email-tdu@semihalf.com (mailing list archive)
State Accepted, archived
Delegated to: Pablo de Lara Guarch
Headers

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel-compilation success Compilation OK

Commit Message

Tomasz Duszynski Oct. 13, 2017, 12:50 p.m. UTC 
  Since new_ip and ip4 are overlapping buffers copying ip4 over new_ip
using memmove() might overwrite memory at ip4. This could happen if
following condition holds:

ip_hdr_len > sizeof(struct esp_hdr) + sa->iv_len

Thus using ip4 to check ip version is wrong as it might not contain
proper value.

Fixes: f159e70b0922 ("examples/ipsec-secgw: support transport mode")
Cc: stable@dpdk.org

Signed-off-by: Tomasz Duszynski <tdu@semihalf.com>
---
 examples/ipsec-secgw/esp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Sergio Gonzalez Monroy Oct. 16, 2017, 9:56 a.m. UTC | #1 
On 13/10/2017 13:50, Tomasz Duszynski wrote:
> Since new_ip and ip4 are overlapping buffers copying ip4 over new_ip
> using memmove() might overwrite memory at ip4. This could happen if
> following condition holds:
>
> ip_hdr_len > sizeof(struct esp_hdr) + sa->iv_len
>
> Thus using ip4 to check ip version is wrong as it might not contain
> proper value.
>
> Fixes: f159e70b0922 ("examples/ipsec-secgw: support transport mode")
> Cc: stable@dpdk.org
>
> Signed-off-by: Tomasz Duszynski <tdu@semihalf.com>
> ---
>   examples/ipsec-secgw/esp.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/examples/ipsec-secgw/esp.c b/examples/ipsec-secgw/esp.c
> index 2897840..063e63f 100644
> --- a/examples/ipsec-secgw/esp.c
> +++ b/examples/ipsec-secgw/esp.c
> @@ -307,8 +307,8 @@ esp_outbound(struct rte_mbuf *m, struct ipsec_sa *sa,
>   				sizeof(struct esp_hdr) + sa->iv_len);
>   		memmove(new_ip, ip4, ip_hdr_len);
>   		esp = (struct esp_hdr *)(new_ip + ip_hdr_len);
> +		ip4 = (struct ip *)new_ip;
>   		if (likely(ip4->ip_v == IPVERSION)) {
> -			ip4 = (struct ip *)new_ip;
>   			ip4->ip_p = IPPROTO_ESP;
>   			ip4->ip_len = htons(rte_pktmbuf_data_len(m));
>   		} else {

Acked-by: Sergio Gonzalez Monroy <sergio.gonzalez.monroy@intel.com>
Aviad Yehezkel Oct. 16, 2017, 10:43 a.m. UTC | #2 
Reviewed-by: Aviad Yehezkel <aviadye@mellanox.com>


On 10/16/2017 12:56 PM, Sergio Gonzalez Monroy wrote:
> On 13/10/2017 13:50, Tomasz Duszynski wrote:
>> Since new_ip and ip4 are overlapping buffers copying ip4 over new_ip
>> using memmove() might overwrite memory at ip4. This could happen if
>> following condition holds:
>>
>> ip_hdr_len > sizeof(struct esp_hdr) + sa->iv_len
>>
>> Thus using ip4 to check ip version is wrong as it might not contain
>> proper value.
>>
>> Fixes: f159e70b0922 ("examples/ipsec-secgw: support transport mode")
>> Cc: stable@dpdk.org
>>
>> Signed-off-by: Tomasz Duszynski <tdu@semihalf.com>
>> ---
>>   examples/ipsec-secgw/esp.c | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/examples/ipsec-secgw/esp.c b/examples/ipsec-secgw/esp.c
>> index 2897840..063e63f 100644
>> --- a/examples/ipsec-secgw/esp.c
>> +++ b/examples/ipsec-secgw/esp.c
>> @@ -307,8 +307,8 @@ esp_outbound(struct rte_mbuf *m, struct ipsec_sa 
>> *sa,
>>                   sizeof(struct esp_hdr) + sa->iv_len);
>>           memmove(new_ip, ip4, ip_hdr_len);
>>           esp = (struct esp_hdr *)(new_ip + ip_hdr_len);
>> +        ip4 = (struct ip *)new_ip;
>>           if (likely(ip4->ip_v == IPVERSION)) {
>> -            ip4 = (struct ip *)new_ip;
>>               ip4->ip_p = IPPROTO_ESP;
>>               ip4->ip_len = htons(rte_pktmbuf_data_len(m));
>>           } else {
>
> Acked-by: Sergio Gonzalez Monroy <sergio.gonzalez.monroy@intel.com>
>
De Lara Guarch, Pablo Oct. 16, 2017, 2:46 p.m. UTC | #3 
> -----Original Message-----
> From: stable [mailto:stable-bounces@dpdk.org] On Behalf Of Sergio
> Gonzalez Monroy
> Sent: Monday, October 16, 2017 10:57 AM
> To: Tomasz Duszynski <tdu@semihalf.com>; dev@dpdk.org
> Cc: stable@dpdk.org
> Subject: Re: [dpdk-stable] [dpdk-dev] [PATCH] examples/ipsec-secgw: fix ip
> version check
> 
> On 13/10/2017 13:50, Tomasz Duszynski wrote:
> > Since new_ip and ip4 are overlapping buffers copying ip4 over new_ip
> > using memmove() might overwrite memory at ip4. This could happen if
> > following condition holds:
> >
> > ip_hdr_len > sizeof(struct esp_hdr) + sa->iv_len
> >
> > Thus using ip4 to check ip version is wrong as it might not contain
> > proper value.
> >
> > Fixes: f159e70b0922 ("examples/ipsec-secgw: support transport mode")
> > Cc: stable@dpdk.org
> >
> > Signed-off-by: Tomasz Duszynski <tdu@semihalf.com>
> > ---
> >   examples/ipsec-secgw/esp.c | 2 +-
> >   1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/examples/ipsec-secgw/esp.c b/examples/ipsec-secgw/esp.c
> > index 2897840..063e63f 100644
> > --- a/examples/ipsec-secgw/esp.c
> > +++ b/examples/ipsec-secgw/esp.c
> > @@ -307,8 +307,8 @@ esp_outbound(struct rte_mbuf *m, struct
> ipsec_sa *sa,
> >   				sizeof(struct esp_hdr) + sa->iv_len);
> >   		memmove(new_ip, ip4, ip_hdr_len);
> >   		esp = (struct esp_hdr *)(new_ip + ip_hdr_len);
> > +		ip4 = (struct ip *)new_ip;
> >   		if (likely(ip4->ip_v == IPVERSION)) {
> > -			ip4 = (struct ip *)new_ip;
> >   			ip4->ip_p = IPPROTO_ESP;
> >   			ip4->ip_len = htons(rte_pktmbuf_data_len(m));
> >   		} else {
> 
> Acked-by: Sergio Gonzalez Monroy <sergio.gonzalez.monroy@intel.com>

Applied to dpdk-next-crypto.
Thanks,

Pablo
diff mbox

Patch

diff --git a/examples/ipsec-secgw/esp.c b/examples/ipsec-secgw/esp.c
index 2897840..063e63f 100644
--- a/examples/ipsec-secgw/esp.c
+++ b/examples/ipsec-secgw/esp.c
@@ -307,8 +307,8 @@  esp_outbound(struct rte_mbuf *m, struct ipsec_sa *sa,
 				sizeof(struct esp_hdr) + sa->iv_len);
 		memmove(new_ip, ip4, ip_hdr_len);
 		esp = (struct esp_hdr *)(new_ip + ip_hdr_len);
+		ip4 = (struct ip *)new_ip;
 		if (likely(ip4->ip_v == IPVERSION)) {
-			ip4 = (struct ip *)new_ip;
 			ip4->ip_p = IPPROTO_ESP;
 			ip4->ip_len = htons(rte_pktmbuf_data_len(m));
 		} else {