lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Thu, 17 Sep 2009 13:20:11 +0800 From: Xiaotian Feng <dfeng@...hat.com> To: davem@...emloft.net, kaber@...sh.net, yoshfuji@...ux-ipv6.org, jmorris@...ei.org, pekkas@...core.fi, kuznet@....inr.ac.ru Cc: netdev@...r.kernel.org, linux-kernel@...r.kernel.org, Xiaotian Feng <dfeng@...hat.com>, Marc Milgram <mmilgram@...hat.com> Subject: [PATCH 2/2] ipv4: make do_ip_setsockopt for IP_MULTICAST_IF support ip_mreq struct 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 <mmilgram@...hat.com> Signed-off-by: Xiaotian Feng <dfeng@...hat.com> Cc: Patrick McHardy <kaber@...sh.net> Cc: David S. Miller <davem@...emloft.net> --- 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@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists