From patchwork Tue Jan 13 07:35:58 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Hongyang X-Patchwork-Id: 18180 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id 4C324DE33F for ; Tue, 13 Jan 2009 18:36:08 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753250AbZAMHgF (ORCPT ); Tue, 13 Jan 2009 02:36:05 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753225AbZAMHgE (ORCPT ); Tue, 13 Jan 2009 02:36:04 -0500 Received: from cn.fujitsu.com ([222.73.24.84]:63419 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1753169AbZAMHgD (ORCPT ); Tue, 13 Jan 2009 02:36:03 -0500 Received: from tang.cn.fujitsu.com (tang.cn.fujitsu.com [10.167.250.3]) by song.cn.fujitsu.com (Postfix) with ESMTP id 6CFE517013A; Tue, 13 Jan 2009 15:59:40 +0800 (CST) Received: from fnst.cn.fujitsu.com (localhost.localdomain [127.0.0.1]) by tang.cn.fujitsu.com (8.13.1/8.13.1) with ESMTP id n0D7Zv1a018554; Tue, 13 Jan 2009 15:35:57 +0800 Received: from localhost.localdomain (unknown [10.167.141.200]) by fnst.cn.fujitsu.com (Postfix) with ESMTPA id 82E7DD43D2; Tue, 13 Jan 2009 15:35:27 +0800 (CST) Message-ID: <496C445E.1000707@cn.fujitsu.com> Date: Tue, 13 Jan 2009 15:35:58 +0800 From: Yang Hongyang User-Agent: Thunderbird 2.0.0.17 (X11/20081009) MIME-Version: 1.0 To: netdev@vger.kernel.org, David Miller Subject: [PATCH]IPv6:remove duplicate check of optlen when setsockopt with IPV6_PKTINFO option Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 --- 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))) {