Patchwork [crypto-chtls] Supicious code in chtls_io

login
register
mail settings
Submitter Gustavo A. R. Silva
Date April 3, 2018, 9:46 p.m.
Message ID <20180403214652.GA31283@embeddedor.com>
Download mbox | patch
Permalink /patch/10321819/
State RFC
Delegated to: Herbert Xu
Headers show

Comments

Gustavo A. R. Silva - April 3, 2018, 9:46 p.m.
Hi all,

While doing some static analysis I came across the following piece of code at drivers/crypto/chelsio/chtls/chtls_io.c:1203:

1203                 if (!size)
1204                         break;
1205 
1206                 if (unlikely(ULP_SKB_CB(skb)->flags & ULPCB_FLAG_NO_APPEND))
1207                         push_frames_if_head(sk);
1208                 continue;
1209 
1210                 set_bit(SOCK_NOSPACE, &sk->sk_socket->flags);
1211         }


The issue is that in the code above, set_bit is never reached due to the 'continue' statement at line 1208.

I wonder if the actual intention of the code was something like this:



What do you think?

I can send a proper patch for this.

Thanks
--
Gustavo
Atul Gupta - April 4, 2018, 10:01 a.m.
On 4/4/2018 3:16 AM, Gustavo A. R. Silva wrote:
> Hi all,
>
> While doing some static analysis I came across the following piece of code at drivers/crypto/chelsio/chtls/chtls_io.c:1203:
>
> 1203                 if (!size)
> 1204                         break;
> 1205 
> 1206                 if (unlikely(ULP_SKB_CB(skb)->flags & ULPCB_FLAG_NO_APPEND))
> 1207                         push_frames_if_head(sk);
> 1208                 continue;
> 1209 
> 1210                 set_bit(SOCK_NOSPACE, &sk->sk_socket->flags);
> 1211         }
>
>
> The issue is that in the code above, set_bit is never reached due to the 'continue' statement at line 1208.
>
> I wonder if the actual intention of the code was something like this:
>
> diff --git a/drivers/crypto/chelsio/chtls/chtls_io.c b/drivers/crypto/chelsio/chtls/chtls_io.c
> index 5a75be4..a949a6c 100644
> --- a/drivers/crypto/chelsio/chtls/chtls_io.c
> +++ b/drivers/crypto/chelsio/chtls/chtls_io.c
> @@ -1203,9 +1203,10 @@ int chtls_sendpage(struct sock *sk, struct page *page,
>                 if (!size)
>                         break;
>  
> -               if (unlikely(ULP_SKB_CB(skb)->flags & ULPCB_FLAG_NO_APPEND))
> +               if (unlikely(ULP_SKB_CB(skb)->flags & ULPCB_FLAG_NO_APPEND)) {
>                         push_frames_if_head(sk);
> -               continue;
> +                       continue;
> +               }
>  
>                 set_bit(SOCK_NOSPACE, &sk->sk_socket->flags);
>         }
>
>
> What do you think?
Thanks for pointing, there is additional change required. I will send the patch once the window opens.
>
> I can send a proper patch for this.
>
> Thanks
> --
> Gustavo

Patch

diff --git a/drivers/crypto/chelsio/chtls/chtls_io.c b/drivers/crypto/chelsio/chtls/chtls_io.c
index 5a75be4..a949a6c 100644
--- a/drivers/crypto/chelsio/chtls/chtls_io.c
+++ b/drivers/crypto/chelsio/chtls/chtls_io.c
@@ -1203,9 +1203,10 @@  int chtls_sendpage(struct sock *sk, struct page *page,
                if (!size)
                        break;
 
-               if (unlikely(ULP_SKB_CB(skb)->flags & ULPCB_FLAG_NO_APPEND))
+               if (unlikely(ULP_SKB_CB(skb)->flags & ULPCB_FLAG_NO_APPEND)) {
                        push_frames_if_head(sk);
-               continue;
+                       continue;
+               }
 
                set_bit(SOCK_NOSPACE, &sk->sk_socket->flags);
        }