d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't allow joins w/o source on an existing group.

Browse Source 
This is almost always pilot error.

We don't need to check for group filter UNDEFINED state at t1,
because we only ever allocate filters with their groups, so we
unconditionally reject such calls with EINVAL.
Trying to change the active filter mode w/o going through IP_MSFILTER
is also disallowed.

Deals with the case described in PR 137164 upfront, cumulative
with the fix in svn rev 197132 which only calls imo_match_source()
if the source address family was not unspecified.

PR:		137164
MFC after:	5 days
This commit is contained in:
Bruce M Simpson 2009-09-12 20:18:23 +00:00
parent e76d823b81
commit 0eebc0d7b4
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=197135
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sys/netinet/in_mcast.c
View File

@ -1982,15 +1982,18 @@ inp_join_group(struct inpcb *inp, struct sockopt *sopt)
}
} else {
/*
* MCAST_JOIN_GROUP on an existing inclusive
* membership is an error; if you want to change
* filter mode, you must use the userland API
* setsourcefilter().
* MCAST_JOIN_GROUP alone, on any existing membership,
* is rejected, to stop the same inpcb tying up
* multiple refs to the in_multi.
* On an existing inclusive membership, this is also
* an error; if you want to change filter mode,
* you must use the userland API setsourcefilter().
* XXX We don't reject this for imf in UNDEFINED
* state at t1, because allocation of a filter
* is atomic with allocation of a membership.
*/
if (imf->imf_st[1] == MCAST_INCLUDE) {
error = EINVAL;
goto out_inp_locked;
}
error = EINVAL;
goto out_inp_locked;
}
}
@ -2025,6 +2028,9 @@ inp_join_group(struct inpcb *inp, struct sockopt *sopt)
* membership of the group. The in_multi may not have
* been allocated yet if this is a new membership, however,
* the in_mfilter slot will be allocated and must be initialized.
*
* Note: Grafting of exclusive mode filters doesn't happen
* in this path.
*/
if (ssa->ss.ss_family != AF_UNSPEC) {
/* Membership starts in IN mode */