Re: [PATCH] ipv6:ip6_xmit remove unnecessary np NULL check

[Eric Dumazet]

On Tue, 2016-11-29 at 12:02 +0530, Manjeet Pawar wrote:
> From: Rohit Thapliyal <r.thapliyal@xxxxxxxxxxx>
> 
> np NULL check doesn't seem required here as it shall never
> be NULL anyways in inet6_sk(sk).
> 
> Signed-off-by: Rohit Thapliyal <r.thapliyal@xxxxxxxxxxx>
> Signed-off-by: Manjeet Pawar <manjeet.p@xxxxxxxxxxx>
> Signed-off-by: David Miller <davem@xxxxxxxxxxxxx>
> Reviewed-by: Akhilesh Kumar <akhilesh.k@xxxxxxxxxxx>
> 
> ---
> v2->v3: Modified as per the suggestion from David Miller
>         ip6_xmit calls are made without checking NULL np
>         pointer, so no need to explicitly check NULL np in
>         ip6_xmit.
> 
>  include/linux/ipv6.h  | 2 +-
>  net/ipv6/ip6_output.c | 3 +--
>  2 files changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/include/linux/ipv6.h b/include/linux/ipv6.h
> index a064997..6c9c604 100644
> --- a/include/linux/ipv6.h
> +++ b/include/linux/ipv6.h
> @@ -299,7 +299,7 @@ struct tcp6_timewait_sock {
>  
>  static inline struct ipv6_pinfo *inet6_sk(const struct sock *__sk)
>  {
> -	return sk_fullsock(__sk) ? inet_sk(__sk)->pinet6 : NULL;
> +	return inet_sk(__sk)->pinet6;


David suggestion was about np being NULL or not in ip6_xmit()

But have you checked inet6_sk() was never called for a TCPv6 TIMEWAIT or
SYN_RECV request ?

>  }
>  
>  static inline struct raw6_sock *raw6_sk(const struct sock *sk)
> diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
> index 59eb4ed..f8c63ec 100644
> --- a/net/ipv6/ip6_output.c
> +++ b/net/ipv6/ip6_output.c
> @@ -213,8 +213,7 @@ int ip6_xmit(const struct sock *sk, struct sk_buff *skb, struct flowi6 *fl6,
>  	/*
>  	 *	Fill in the IPv6 header
>  	 */
> -	if (np)
> -		hlimit = np->hop_limit;
> +	hlimit = np->hop_limit;
>  	if (hlimit < 0)
>  		hlimit = ip6_dst_hoplimit(dst);
>  

This part is fine.