Re: [PATCH v2] seccomp: Make syscall skipping and nr changes more consistent

[Andy Lutomirski]

On Thu, Aug 2, 2012 at 9:36 PM, James Morris <jmorris@xxxxxxxxx> wrote:
> On Wed, 1 Aug 2012, Andy Lutomirski wrote:
>
>> This fixes two issues that could cause incompatibility between
>> kernel versions:
>>
>>  - If a tracer uses SECCOMP_RET_TRACE to select a syscall number
>>    higher than the largest known syscall, emulate the unknown
>>    vsyscall by returning -ENOSYS.  (This is unlikely to make a
>>    noticeable difference on x86-64 due to the way the system call
>>    entry works.)
>>
>>  - On x86-64 with vsyscall=emulate, skipped vsyscalls were buggy.
>>
>> This updates the documentation accordingly.
>>
>> Signed-off-by: Andy Lutomirski <luto@xxxxxxxxxxxxxx>
>> Acked-by: Will Drewry <wad@xxxxxxxxxxxx>
>
> Please rebase this to
> git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git next
>
> or wait until the next -rc, where I'll sync with Linus.
>

The conflict is because Linus has a partial fix for the same problem
that went in very late for 3.5, which isn't in your tree.  My patch
applies cleanly to 3.6.0-rc1 and to the result of merging your tree
with 3.6.0-rc1.

The relevant upstream changes are
5651721edec25bf73cee060150e684044eac42dc and
09d314425f5bc69fcf793c7890d9e6a3cdcb44be.

If it helps, I can stick the patch into git.

--Andy
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/