Re: [PATCH] ipvs: uninitialized data with IP_VS_IPV6

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Mon, 2015-01-26 at 12:08 +0100, Pablo Neira Ayuso wrote:
> From: Dan Carpenter <dan.carpenter@xxxxxxxxxx>
> 
> [ upstream commit 3b05ac3824ed9648c0d9c02d51d9b54e4e7e874f ]
> 
> The app_tcp_pkt_out() function expects "*diff" to be set and ends up
> using uninitialized data if CONFIG_IP_VS_IPV6 is turned on.
> 
> The same issue is there in app_tcp_pkt_in().  Thanks to Julian Anastasov
> for noticing that.

Queued up for 3.2, thanks.

Ben.

> Cc: <stable@xxxxxxxxxxxxxxx> # 3.2.x
> Cc: <stable@xxxxxxxxxxxxxxx> # 3.4.x
> Cc: <stable@xxxxxxxxxxxxxxx> # 3.10.x
> Cc: <stable@xxxxxxxxxxxxxxx> # 3.14.x
> Cc: <stable@xxxxxxxxxxxxxxx> # 3.17.x
> Cc: <stable@xxxxxxxxxxxxxxx> # 3.18.x
> Signed-off-by: Dan Carpenter <dan.carpenter@xxxxxxxxxx>
> Acked-by: Julian Anastasov <ja@xxxxxx>
> Signed-off-by: Simon Horman <horms@xxxxxxxxxxxx>
> ---
>  net/netfilter/ipvs/ip_vs_ftp.c |   10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/net/netfilter/ipvs/ip_vs_ftp.c b/net/netfilter/ipvs/ip_vs_ftp.c
> index 1d5341f..5d3daae 100644
> --- a/net/netfilter/ipvs/ip_vs_ftp.c
> +++ b/net/netfilter/ipvs/ip_vs_ftp.c
> @@ -183,6 +183,8 @@ static int ip_vs_ftp_out(struct ip_vs_app *app, struct ip_vs_conn *cp,
>  	struct nf_conn *ct;
>  	struct net *net;
>  
> +	*diff = 0;
> +
>  #ifdef CONFIG_IP_VS_IPV6
>  	/* This application helper doesn't work with IPv6 yet,
>  	 * so turn this into a no-op for IPv6 packets
> @@ -191,8 +193,6 @@ static int ip_vs_ftp_out(struct ip_vs_app *app, struct ip_vs_conn *cp,
>  		return 1;
>  #endif
>  
> -	*diff = 0;
> -
>  	/* Only useful for established sessions */
>  	if (cp->state != IP_VS_TCP_S_ESTABLISHED)
>  		return 1;
> @@ -322,6 +322,9 @@ static int ip_vs_ftp_in(struct ip_vs_app *app, struct ip_vs_conn *cp,
>  	struct ip_vs_conn *n_cp;
>  	struct net *net;
>  
> +	/* no diff required for incoming packets */
> +	*diff = 0;
> +
>  #ifdef CONFIG_IP_VS_IPV6
>  	/* This application helper doesn't work with IPv6 yet,
>  	 * so turn this into a no-op for IPv6 packets
> @@ -330,9 +333,6 @@ static int ip_vs_ftp_in(struct ip_vs_app *app, struct ip_vs_conn *cp,
>  		return 1;
>  #endif
>  
> -	/* no diff required for incoming packets */
> -	*diff = 0;
> -
>  	/* Only useful for established sessions */
>  	if (cp->state != IP_VS_TCP_S_ESTABLISHED)
>  		return 1;

-- 
Ben Hutchings
Once a job is fouled up, anything done to improve it makes it worse.

Attachment: signature.asc
Description: This is a digitally signed message part


[Index of Archives]     [Linux Kernel]     [Kernel Development Newbies]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite Hiking]     [Linux Kernel]     [Linux SCSI]