svn commit: r255219 - in head: contrib/tcpdump lib/libc lib/libc/capability lib/libc/include lib/libc/sys lib/libprocstat sbin/dhclient sbin/hastd sys/amd64/linux32 sys/bsm sys/cddl/compat/opensola...

[Stanislav Sedov]

On Sep 4, 2013, at 5:09 PM, Pawel Jakub Dawidek <pjd at FreeBSD.org> wrote:

>  This commit also breaks compatibility with some existing Capsicum system calls,
>  but I see no other way to do that. This should be fine as Capsicum is still
>  experimental and this change is not going to 9.x.

Hi!

This change also increases the size of kinfo_file structure, which won’t allow
programs not compiled against HEAD and working with kern.info.filedesc sysctl
to run properly on HEAD (e.g. 8.x, 9.x and 10.x jails won’t run properly on HEAD,
and it also broke valgrind).  Is there absolutely no way to avoid extending the size
of this struct?

Thanks!

>  #if defined(__amd64__) || defined(__i386__)
> -#define        KINFO_FILE_SIZE 1392
> +#define        KINFO_FILE_SIZE 1424
>  #endif
>  
>  struct kinfo_file {
> @@ -389,6 +390,7 @@
>         uint16_t        kf_pad1;                /* Round to 32 bit alignment. */
>         int             _kf_ispare0;            /* Space for more stuff. */
>         cap_rights_t    kf_cap_rights;          /* Capability rights. */
> +       uint64_t        _kf_cap_spare[3];       /* Space for future cap_rights_t. */
>         int             _kf_ispare[4];          /* Space for more stuff. */
>         /* Truncated before copyout in sysctl */
>         char            kf_path[PATH_MAX];      /* Path to file, if any. */

--
ST4096-RIPE