From: Li Wei <lw@cn•fujitsu.com>
To: davem@davemloft•net
Cc: Li Wei <lw@cn•fujitsu.com>, netdev@vger•kernel.org, dlstevens@us•ibm.com
Subject: [PATCH v2] ipv4/ipv6: multicast api unappropriate errno fix.
Date: Fri, 03 Aug 2012 17:29:05 +0800 [thread overview]
Message-ID: <501B99E1.9090803@cn.fujitsu.com> (raw)
In-Reply-To: <1343977605-14446-1-git-send-email-lw@cn.fujitsu.com>
commit 917f2f105([IPV4]: multicast API "join" issues) corrected
some errno values but also caused unappropriate errno returned.
With an unjoined group address, return -EADDRNOTAVAIL would be
much better than -EINVAL.
Also correct the errno when to join an source group which we have
already joined to -EADDRINUSE.
Signed-off-by: Li Wei <lw@cn•fujitsu.com>
--
V2: return -EADDRINUSE when join an already joined source group.
---
net/ipv4/igmp.c | 8 +++-----
net/ipv6/mcast.c | 12 ++++++------
2 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/net/ipv4/igmp.c b/net/ipv4/igmp.c
index 6699f23..c45c092 100644
--- a/net/ipv4/igmp.c
+++ b/net/ipv4/igmp.c
@@ -1933,10 +1933,8 @@ int ip_mc_source(int add, int omode, struct sock *sk, struct
(pmc->multi.imr_ifindex == imr.imr_ifindex))
break;
}
- if (!pmc) { /* must have a prior join */
- err = -EINVAL;
- goto done;
- }
+ if (!pmc) /* must have a prior join */
+ goto done; /* err = -EADDRNOTAVAIL */
/* if a source filter was set, must be the same mode as before */
if (pmc->sflist) {
if (pmc->sfmode != omode) {
@@ -2076,7 +2074,7 @@ int ip_mc_msfilter(struct sock *sk, struct ip_msfilter *msf, int ifindex)
break;
}
if (!pmc) { /* must have a prior join */
- err = -EINVAL;
+ err = -EADDRNOTAVAIL;
goto done;
}
if (msf->imsf_numsrc) {
diff --git a/net/ipv6/mcast.c b/net/ipv6/mcast.c
index 92f8e48..dcd12c0 100644
--- a/net/ipv6/mcast.c
+++ b/net/ipv6/mcast.c
@@ -347,10 +347,8 @@ int ip6_mc_source(int add, int omode, struct sock *sk,
if (ipv6_addr_equal(&pmc->addr, group))
break;
}
- if (!pmc) { /* must have a prior join */
- err = -EINVAL;
- goto done;
- }
+ if (!pmc) /* must have a prior join */
+ goto done; /* err = -EADDRNOTAVAIL */
/* if a source filter was set, must be the same mode as before */
if (pmc->sflist) {
if (pmc->sfmode != omode) {
@@ -428,8 +426,10 @@ int ip6_mc_source(int add, int omode, struct sock *sk,
if (rv == 0)
break;
}
- if (rv == 0) /* address already there is an error */
+ if (rv == 0) { /* address already there is an error */
+ err = -EADDRINUSE;
goto done;
+ }
for (j=psl->sl_count-1; j>=i; j--)
psl->sl_addr[j+1] = psl->sl_addr[j];
psl->sl_addr[i] = *source;
@@ -488,7 +488,7 @@ int ip6_mc_msfilter(struct sock *sk, struct group_filter *gsf)
break;
}
if (!pmc) { /* must have a prior join */
- err = -EINVAL;
+ err = -EADDRNOTAVAIL;
goto done;
}
if (gsf->gf_numsrc) {
--
1.7.10.1
next prev parent reply other threads:[~2012-08-03 9:30 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-03 7:06 [PATCH] ipv4/ipv6: multicast api unappropriate errno fix Li Wei
2012-08-03 9:29 ` Li Wei [this message]
2012-08-03 12:09 ` [PATCH v2] " David Stevens
2012-08-06 1:19 ` Li Wei
2012-08-03 9:31 ` [PATCH] " Li Wei
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=501B99E1.9090803@cn.fujitsu.com \
--to=lw@cn$(echo .)fujitsu.com \
--cc=davem@davemloft$(echo .)net \
--cc=dlstevens@us$(echo .)ibm.com \
--cc=netdev@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox