All of lore.kernel.org
 help / color / mirror / Atom feed
From: Yang Hongyang <yanghy@cn.fujitsu.com>
To: netdev@vger.kernel.org, David Miller <davem@davemloft.net>
Subject: [PATCH]IPv6:remove duplicate check of optlen when setsockopt with IPV6_PKTINFO option
Date: Tue, 13 Jan 2009 15:35:58 +0800	[thread overview]
Message-ID: <496C445E.1000707@cn.fujitsu.com> (raw)

Actually the condition (optlen == 0) is included in (optlen < sizeof(struct in6_pktinfo)),
so we do not need to check it separately.

Signed-off-by: Yang Hongyang<yanghy@cn.fujitsu.com>

---
 net/ipv6/ipv6_sockglue.c |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c
index 40f3246..e6affa7 100644
--- a/net/ipv6/ipv6_sockglue.c
+++ b/net/ipv6/ipv6_sockglue.c
@@ -399,9 +399,7 @@ sticky_done:
 	{
 		struct in6_pktinfo pkt;
 
-		if (optlen == 0)
-			goto e_inval;
-		else if (optlen < sizeof(struct in6_pktinfo) || optval == NULL)
+		if (optlen < sizeof(struct in6_pktinfo) || optval == NULL)
 			goto e_inval;
 
 		if (copy_from_user(&pkt, optval, sizeof(struct in6_pktinfo))) {
-- 
1.6.0.3
-- 
Regards
Yang Hongyang

             reply	other threads:[~2009-01-13  7:36 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-01-13  7:35 Yang Hongyang [this message]
2009-01-14  3:47 ` [PATCH]IPv6:remove duplicate check of optlen when setsockopt with IPV6_PKTINFO option Herbert Xu
2009-01-14  3:54   ` Yang Hongyang
2009-01-14  4:07     ` Wei Yongjun
2009-01-14  5:27       ` Yang Hongyang
2009-01-14  8:26         ` Shan Wei
2009-01-15  0:50           ` [PATCHv2]IPv6:remove duplicate check " Yang Hongyang
2009-01-14  4:48     ` [PATCH]IPv6:remove duplicate check of optlen " Herbert Xu
2009-01-15  5:02       ` David Miller
2009-01-15  5:04         ` Herbert Xu
2009-01-15  5:06           ` Herbert Xu
2009-01-15  5:25             ` Yang Hongyang
2009-01-15  5:43           ` David Miller
2009-01-15  5:34         ` Yang Hongyang
2009-01-15  5:37           ` Herbert Xu
2009-01-15  5:45             ` David Miller
2009-01-15  5:48               ` Herbert Xu
2009-01-15 10:07               ` Yang Hongyang

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=496C445E.1000707@cn.fujitsu.com \
    --to=yanghy@cn.fujitsu.com \
    --cc=davem@davemloft.net \
    --cc=netdev@vger.kernel.org \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.