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...

[Pawel Jakub Dawidek]

On Wed, Jan 01, 2014 at 11:16:22PM -0800, Stanislav Sedov wrote:
> 
> 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?

Well, I made this change to have space for future cap_rights_t
expension. I did that change for a major branch, so we don't have to do
it in the middle of 10.x or to not block the work until 11.0.

Note that the structure changed size not only because of _kf_cap_spare[3]
field, but also because cap_rights_t is not uint64_t anymore, it is now
struct that contains two uint64_t (1424 - 1392 = 4 * 8).

I'm afraid it is too late to change it for 10.0 at this point anyway.
Not sure if you are aware this was merged to 10, because you write about
10.x jails not working properly on HEAD. 10.x jails will work properly
on HEAD.

BTW. I'd love if we stop using such structures for a running kernel.
We should really move to using libnv to export data like that.

> >  #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. */

-- 
Pawel Jakub Dawidek                       http://www.wheelsystems.com
FreeBSD committer                         http://www.FreeBSD.org
Am I Evil? Yes, I Am!                     http://mobter.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 196 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/svn-src-all/attachments/20140102/d36c2f43/attachment.sig>