ich777/linux_media
1
0
Fork 0
mirror of https://github.com/tbsdtv/linux_media.git synced 2025-07-23 12:43:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

sctp: remove unnecessary NULL check in sctp_association_init()

Browse Source 
'&asoc->ulpq' passed to sctp_ulpq_init() as the first argument,
then sctp_qlpq_init() initializes it and eventually returns the
address of the struct member back. Therefore, in this case, the
return pointer cannot be NULL.

Moreover, it seems sctp_ulpq_init() has always been used only in
sctp_association_init(), so there's really no need to return ulpq
anymore.

Detected using the static analysis tool - Svace.
Signed-off-by: Alexey Kodanev <aleksei.kodanev@bell-sw.com>
Reviewed-by: Xin Long <lucien.xin@gmail.com>
Link: https://lore.kernel.org/r/20221019180735.161388-1-aleksei.kodanev@bell-sw.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Alexey Kodanev
2022-10-19 21:07:33 +03:00
committed by Jakub Kicinski
parent 94adb5e29e
commit 6fdfdef7fd
3 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/net/sctp/ulpqueue.h
View File

@@ -35,8 +35,7 @@ struct sctp_ulpq {
}; };
/* Prototypes. */ /* Prototypes. */
struct sctp_ulpq *sctp_ulpq_init(struct sctp_ulpq *, void sctp_ulpq_init(struct sctp_ulpq *ulpq, struct sctp_association *asoc);
struct sctp_association *);
void sctp_ulpq_flush(struct sctp_ulpq *ulpq); void sctp_ulpq_flush(struct sctp_ulpq *ulpq);
void sctp_ulpq_free(struct sctp_ulpq *); void sctp_ulpq_free(struct sctp_ulpq *);

4
net/sctp/associola.c
View File

@@ -226,8 +226,7 @@ static struct sctp_association *sctp_association_init(
/* Create an output queue. */ /* Create an output queue. */
sctp_outq_init(asoc, &asoc->outqueue); sctp_outq_init(asoc, &asoc->outqueue);
if (!sctp_ulpq_init(&asoc->ulpq, asoc)) sctp_ulpq_init(&asoc->ulpq, asoc);
goto fail_init;
if (sctp_stream_init(&asoc->stream, asoc->c.sinit_num_ostreams, 0, gfp)) if (sctp_stream_init(&asoc->stream, asoc->c.sinit_num_ostreams, 0, gfp))
goto stream_free; goto stream_free;
@@ -277,7 +276,6 @@ static struct sctp_association *sctp_association_init(
stream_free: stream_free:
sctp_stream_free(&asoc->stream); sctp_stream_free(&asoc->stream);
fail_init:
sock_put(asoc->base.sk); sock_put(asoc->base.sk);
sctp_endpoint_put(asoc->ep); sctp_endpoint_put(asoc->ep);
return NULL; return NULL;

5
net/sctp/ulpqueue.c
View File

@@ -38,8 +38,7 @@ static void sctp_ulpq_reasm_drain(struct sctp_ulpq *ulpq);
/* 1st Level Abstractions */ /* 1st Level Abstractions */
/* Initialize a ULP queue from a block of memory. */ /* Initialize a ULP queue from a block of memory. */
struct sctp_ulpq *sctp_ulpq_init(struct sctp_ulpq *ulpq, void sctp_ulpq_init(struct sctp_ulpq *ulpq, struct sctp_association *asoc)
struct sctp_association *asoc)
{ {
memset(ulpq, 0, sizeof(struct sctp_ulpq)); memset(ulpq, 0, sizeof(struct sctp_ulpq));
@@ -48,8 +47,6 @@ struct sctp_ulpq *sctp_ulpq_init(struct sctp_ulpq *ulpq,
skb_queue_head_init(&ulpq->reasm_uo); skb_queue_head_init(&ulpq->reasm_uo);
skb_queue_head_init(&ulpq->lobby); skb_queue_head_init(&ulpq->lobby);
ulpq->pd_mode = 0; ulpq->pd_mode = 0;
return ulpq;
} }