Merge branch 'maint-0.3.1' into release-0.3.1
This commit is contained in:
commit
180e21fbc0
|
@ -0,0 +1,4 @@
|
||||||
|
o Minor bugfixes (linux seccomp2 sandbox):
|
||||||
|
- Avoid a sandbox failure when trying to re-bind to a socket and mark
|
||||||
|
it as IPv6-only. Fixes bug 20247; bugfix on 0.2.5.1-alpha.
|
||||||
|
|
|
@ -734,6 +734,14 @@ sb_setsockopt(scmp_filter_ctx ctx, sandbox_cfg_t *filter)
|
||||||
return rc;
|
return rc;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef IPV6_V6ONLY
|
||||||
|
rc = seccomp_rule_add_2(ctx, SCMP_ACT_ALLOW, SCMP_SYS(setsockopt),
|
||||||
|
SCMP_CMP(1, SCMP_CMP_EQ, IPPROTO_IPV6),
|
||||||
|
SCMP_CMP(2, SCMP_CMP_EQ, IPV6_V6ONLY));
|
||||||
|
if (rc)
|
||||||
|
return rc;
|
||||||
|
#endif
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue