netdev - Re: [PATCH net-next 3/3] sctp: remove unnecessary NULL checks in sctp_enqueue

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:   Wed, 19 Oct 2022 17:28:02 -0400
From:   Xin Long <lucien.xin@...il.com>
To:     Alexey Kodanev <aleksei.kodanev@...l-sw.com>
Cc:     linux-sctp@...r.kernel.org, netdev@...r.kernel.org
Subject: Re: [PATCH net-next 3/3] sctp: remove unnecessary NULL checks in sctp_enqueue_event()

On Wed, Oct 19, 2022 at 2:36 PM Alexey Kodanev
<aleksei.kodanev@...l-sw.com> wrote:
>
> After commit 178ca044aa60 ("sctp: Make sctp_enqueue_event tak an
> skb list."), skb_list cannot be NULL.
>
> Detected using the static analysis tool - Svace.
> Signed-off-by: Alexey Kodanev <aleksei.kodanev@...l-sw.com>
> ---
>  net/sctp/stream_interleave.c | 12 +++---------
>  1 file changed, 3 insertions(+), 9 deletions(-)
>
> diff --git a/net/sctp/stream_interleave.c b/net/sctp/stream_interleave.c
> index bb22b71df7a3..94727feb07b3 100644
> --- a/net/sctp/stream_interleave.c
> +++ b/net/sctp/stream_interleave.c
> @@ -490,11 +490,8 @@ static int sctp_enqueue_event(struct sctp_ulpq *ulpq,
>         if (!sctp_ulpevent_is_enabled(event, ulpq->asoc->subscribe))
>                 goto out_free;
>
> -       if (skb_list)
> -               skb_queue_splice_tail_init(skb_list,
> -                                          &sk->sk_receive_queue);
> -       else
> -               __skb_queue_tail(&sk->sk_receive_queue, skb);
> +       skb_queue_splice_tail_init(skb_list,
> +                                  &sk->sk_receive_queue);
>
>         if (!sp->data_ready_signalled) {
>                 sp->data_ready_signalled = 1;
> @@ -504,10 +501,7 @@ static int sctp_enqueue_event(struct sctp_ulpq *ulpq,
>         return 1;
>
>  out_free:
> -       if (skb_list)
> -               sctp_queue_purge_ulpevents(skb_list);
> -       else
> -               sctp_ulpevent_free(event);
> +       sctp_queue_purge_ulpevents(skb_list);
>
>         return 0;
>  }
> --
> 2.25.1
>
Reviewed-by: Xin Long <lucien.xin@...il.com>