| Message ID | 496E8843.8000906@cn.fujitsu.com |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c index 40f3246..1c203b6 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)) goto e_inval; if (copy_from_user(&pkt, optval, sizeof(struct in6_pktinfo))) {
Actually the condition (optlen == 0) is included in (optlen < sizeof(struct in6_pktinfo)), so we do not need to check it separately. We don't need to check (optval==NULL) either,because copy_from_user() will do the job. Signed-off-by: Yang Hongyang<yanghy@cn.fujitsu.com> --- net/ipv6/ipv6_sockglue.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-)