Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759464Ab2HITf4 (ORCPT ); Thu, 9 Aug 2012 15:35:56 -0400 Received: from mail-wi0-f172.google.com ([209.85.212.172]:50346 "EHLO mail-wi0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759292Ab2HITfz (ORCPT ); Thu, 9 Aug 2012 15:35:55 -0400 MIME-Version: 1.0 In-Reply-To: References: <744e07394a02be3d3ef52c22ccedb24d9a478fe1.1343869850.git.luto@amacapital.net> From: Andy Lutomirski Date: Thu, 9 Aug 2012 12:35:33 -0700 Message-ID: Subject: Re: [PATCH v2] seccomp: Make syscall skipping and nr changes more consistent To: James Morris Cc: James Morris , linux-kernel@vger.kernel.org, Will Drewry , x86@kernel.org Content-Type: text/plain; charset=ISO-8859-1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1532 Lines: 42 On Thu, Aug 2, 2012 at 9:36 PM, James Morris 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 >> Acked-by: Will Drewry > > 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@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/