mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-30 12:04:07 +00:00
Code Issues Releases Activity

Adapt r197135 to IPv6 stack:

Browse Source 
Don't allow joins w/o source on an existing group.
  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 IPV6_MSFILTER
  is also disallowed.

MFC after:	1 day
This commit is contained in:
Bruce M Simpson 2009-11-19 13:33:23 +00:00
parent 1ee6b058a2
commit 604a60d1f0
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=199527
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/netinet6/in6_mcast.c
View File

@ -1942,15 +1942,18 @@ in6p_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->im6f_st[1] == MCAST_INCLUDE) {
error = EINVAL;
goto out_in6p_locked;
}
error = EINVAL;
goto out_in6p_locked;
}
}
@ -1985,6 +1988,9 @@ in6p_join_group(struct inpcb *inp, struct sockopt *sopt)
* membership of the group. The in6_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 */