Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753663AbZIQFVX (ORCPT ); Thu, 17 Sep 2009 01:21:23 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753567AbZIQFVV (ORCPT ); Thu, 17 Sep 2009 01:21:21 -0400 Received: from mx1.redhat.com ([209.132.183.28]:1163 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753378AbZIQFVO (ORCPT ); Thu, 17 Sep 2009 01:21:14 -0400 From: Xiaotian Feng To: davem@davemloft.net, kaber@trash.net, yoshfuji@linux-ipv6.org, jmorris@namei.org, pekkas@netcore.fi, kuznet@ms2.inr.ac.ru Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Xiaotian Feng , Marc Milgram Subject: [PATCH 2/2] ipv4: make do_ip_setsockopt for IP_MULTICAST_IF support ip_mreq struct Date: Thu, 17 Sep 2009 13:20:11 +0800 Message-Id: <1253164811-15820-1-git-send-email-dfeng@redhat.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1405 Lines: 41 ip_mreq and ip_mreqn is almost the same, and do_ip_setsockopt for IP_MULTICAST_IF part supported ip_mreqn struct. This patch adds support for ip_mreq struct. Signed-off-by: Marc Milgram Signed-off-by: Xiaotian Feng Cc: Patrick McHardy Cc: David S. Miller --- net/ipv4/ip_sockglue.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c index 5a29dce..1e8d026 100644 --- a/net/ipv4/ip_sockglue.c +++ b/net/ipv4/ip_sockglue.c @@ -612,11 +612,16 @@ static int do_ip_setsockopt(struct sock *sk, int level, */ err = -EFAULT; + memset(&mreq, 0, sizeof(mreq)); + if (optlen >= sizeof(struct ip_mreqn)) { if (copy_from_user(&mreq, optval, sizeof(mreq))) break; + } else if (optlen >= sizeof(struct ip_mreq)) { + if (copy_from_user(&mreq, optval, + sizeof(struct ip_mreq))) + break; } else if (optlen >= sizeof(struct in_addr)) { - memset(&mreq, 0, sizeof(mreq)); if (copy_from_user(&mreq.imr_address, optval, sizeof(struct in_addr))) break; -- 1.6.2.5 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/