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

Bring back the old size of the kinfo_file structure to preserve ABI.

Browse Source 
Keep only one uint64_t spare for further cap_rights_t expension.

Add a comment clarifying that if the size of this structure changes,
a new sysctl MIB has to be allocate for it and the old structure has
to be returned by the old sysctl MIB.

Requested by:	re
MFC after:	3 days
This commit is contained in:
pjd 2014-01-04 21:55:06 +00:00
parent 27a6c698d6
commit a2d1c311a1
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sys/sys/user.h
View File

@ -320,7 +320,13 @@ struct kinfo_ofile {
}; };
#if defined(__amd64__) || defined(__i386__) #if defined(__amd64__) || defined(__i386__)
#define KINFO_FILE_SIZE 1424 /*
* This size should never be changed. If you really need to, you must provide
* backward ABI compatibility by allocating a new sysctl MIB that will return
* the new structure. The current structure has to be returned by the current
* sysctl MIB. See how it is done for the kinfo_ofile structure.
*/
#define KINFO_FILE_SIZE 1392
#endif #endif
struct kinfo_file { struct kinfo_file {
@ -391,8 +397,7 @@ struct kinfo_file {
uint16_t kf_pad1; /* Round to 32 bit alignment. */ uint16_t kf_pad1; /* Round to 32 bit alignment. */
int _kf_ispare0; /* Space for more stuff. */ int _kf_ispare0; /* Space for more stuff. */
cap_rights_t kf_cap_rights; /* Capability rights. */ cap_rights_t kf_cap_rights; /* Capability rights. */
uint64_t _kf_cap_spare[3]; /* Space for future cap_rights_t. */ uint64_t _kf_cap_spare; /* Space for future cap_rights_t. */
int _kf_ispare[4]; /* Space for more stuff. */
/* Truncated before copyout in sysctl */ /* Truncated before copyout in sysctl */
char kf_path[PATH_MAX]; /* Path to file, if any. */ char kf_path[PATH_MAX]; /* Path to file, if any. */
}; };