From: Vlad Yasevich <vladislav.yasevich@hp.com>
To: Dan Carpenter <error27@gmail.com>
Cc: Sridhar Samudrala <sri@us.ibm.com>,
"David S. Miller" <davem@davemloft.net>,
Wei Yongjun <yjwei@cn.fujitsu.com>,
Chris Dischino <cdischino@sonusnet.com>,
linux-sctp@vger.kernel.org, netdev@vger.kernel.org,
kernel-janitors@vger.kernel.org
Subject: Re: [patch] sctp: cleanup: remove unneeded null check
Date: Fri, 23 Apr 2010 10:28:45 -0400 [thread overview]
Message-ID: <4BD1AE9D.6090807@hp.com> (raw)
In-Reply-To: <20100423115906.GE29093@bicker>
Dan Carpenter wrote:
> "chunk" can never be null here. We dereferenced it earlier in the
> function and also at the start of the function we passed it to
> sctp_pack_cookie() which dereferences it.
>
> This code has been around since the dawn of git history so if "chunk"
> were ever null someone would have complained about it.
>
> Signed-off-by: Dan Carpenter <error27@gmail.com>
>
> diff --git a/net/sctp/sm_make_chunk.c b/net/sctp/sm_make_chunk.c
> index 17cb400..52352fc 100644
> --- a/net/sctp/sm_make_chunk.c
> +++ b/net/sctp/sm_make_chunk.c
> @@ -470,8 +470,7 @@ struct sctp_chunk *sctp_make_init_ack(const struct sctp_association *asoc,
> *
> * [INIT ACK back to where the INIT came from.]
> */
> - if (chunk)
> - retval->transport = chunk->transport;
> + retval->transport = chunk->transport;
>
Actually, this code can be completely removed as we already make this assignment
earlier:
/* Per the advice in RFC 2960 6.4, send this reply to
* the source of the INIT packet.
*/
retval->transport = chunk->transport;
retval->subh.init_hdr =
sctp_addto_chunk(retval, sizeof(initack), &initack);
-vlad
> nomem_chunk:
> kfree(cookie);
> --
> To unsubscribe from this list: send the line "unsubscribe linux-sctp" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
next prev parent reply other threads:[~2010-04-23 14:28 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-04-23 11:59 [patch] sctp: cleanup: remove unneeded null check Dan Carpenter
2010-04-23 14:28 ` Vlad Yasevich [this message]
2010-04-24 17:19 ` [patch v2] sctp: cleanup: remove duplicate assignment Dan Carpenter
2010-04-27 14:32 ` Vlad Yasevich
2010-04-27 16:58 ` David Miller
2010-04-27 17:32 ` Vlad Yasevich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4BD1AE9D.6090807@hp.com \
--to=vladislav.yasevich@hp.com \
--cc=cdischino@sonusnet.com \
--cc=davem@davemloft.net \
--cc=error27@gmail.com \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-sctp@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=sri@us.ibm.com \
--cc=yjwei@cn.fujitsu.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).