From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752164AbdBNGhp (ORCPT ); Tue, 14 Feb 2017 01:37:45 -0500 Received: from mail-db5eur01on0095.outbound.protection.outlook.com ([104.47.2.95]:46620 "EHLO EUR01-DB5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750716AbdBNGhn (ORCPT ); Tue, 14 Feb 2017 01:37:43 -0500 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=avagin@virtuozzo.com; Date: Mon, 13 Feb 2017 22:37:26 -0800 From: Andrei Vagin To: Kees Cook CC: James Morris , Mike Frysinger , Paul Moore , Tyler Hicks , Andy Lutomirski , Will Drewry , linux-security-module , Subject: Re: [PATCH] seccomp: Only dump core when single-threaded Message-ID: <20170214063724.GA9021@outlook.office365.com> References: <20170207231851.GA129818@beast> MIME-Version: 1.0 Content-Type: text/plain; charset="koi8-r" Content-Disposition: inline In-Reply-To: <20170207231851.GA129818@beast> User-Agent: Mutt/1.7.1 (2016-10-04) X-Originating-IP: [67.183.159.197] X-ClientProxiedBy: BN6PR08CA0057.namprd08.prod.outlook.com (10.172.144.19) To AM5PR0801MB1972.eurprd08.prod.outlook.com (10.168.158.11) X-MS-Office365-Filtering-Correlation-Id: 9fdaca71-3cde-449e-46da-08d454a3f86f X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001);SRVR:AM5PR0801MB1972; X-Microsoft-Exchange-Diagnostics: 1;AM5PR0801MB1972;3:IUc7CIUI/0GqDQ7BltTge0ntK+cxvWu8MPGCSBfqT6rTzLvHU+VttMz8i4ihv6eUXqilI9VfawtZoVuiJYumiCq5QylTvZwPoyQHIZIP/80eo5DQTqcJ3S31K1EZevh3w5RhFyMdhbUY4baqmWT3+Hp5k3z+SQzB3SP0FLO84YxvbrtrT/RaBvaBrlHBaU/ZnMch6+YLHqbUXcz/i4AnWS1PWzGm5+h5HEuu0sDRHlsVf/dah1HWA5i3DLp+JmYgcEmzwYYLoYRPyble+tq44w==;25:+0E/014ty7ijCKA0yKeRcFNBuCphaUItsNFpXns1PC9IRvXQRsCmv7ZvbXsV8ueaQPAIYizqEwrGRWGaeMXckov+aQutcpPpW/g5xKUGbFPMpPv2Pw7296wEzgk2oMPUG6GmRKDrQKFZbjDaRwV8+F22ZuaHQ484+lNy+7PJHKvjlElU4aoGsrmNWfuQ2nh/CrWokWWJw7X5A9FKJF9rZKbZ/JUaHNLSBSQ1BR6WdNqWih8PupXk2EG0IaLsj5Esv6iTmGBmqfCMn0dEQXJZmhIhe5+QuJfj1lNbk4Th/qrqOsfNBZGyWPwGnPQ+2xIUiD9ohWXjguQ1o78/+Go2a8QLjNXZtdTeM8WV9tFW04BuGaxjxe/EZiFOD7Li83V8lRjxxl9lKaHrk/hbAtY34qLYkv0SrJ6DuBO1hCsQqAuhgkxMlTQDVIkuEihTbGdtr5Cq/nq5UV8b+QrbPKD/qQ== X-Microsoft-Exchange-Diagnostics: 1;AM5PR0801MB1972;31:18LhyExwoXgarzvPq8pe2nXpEaXRcgv8Q5Nfvnrxb142mQmyHZkJ3Ug6KzIdzOpVvJVRRKICw36uorievzPGGVl8+AxG4fYG4pDEiFIPRlztka+z0XAJp4fgFxY/1sd9D3YO60YSdm8OvFNzkjRhV9OyrSSxcGQozngs7on5UBQ+R2dD6bnCLx0XZpacz49EZWdpa5fvqqhXNxC/Td0jAcpzc29LlnXJ/tPlK4sjrD7Yad/1KsGoV8MyKuW4UT9BHL/H5JCoFp/S856iVwUU6A==;20:0AP7NZQaHn+XQP7kFtQS3sXQcYNMBvDEPS8M+hs7yUgFvzOqy3/eS7o2wbPwfh1f/utZpRKC3lQGVT6kjNWJ0zmUF4l1/5ULyx1yUVjWfx+Ev7bSeGREMA3vQuYzlVOejjqFkTQP9B+HusMjevOguYxi1k9nNCmForNQeh7PXZCjX4255B8g/e7ODnJn1TVS7detZjxTSw8aS/7TiJV/K8ExcpPrwjsIzY9+htvwGZNapZOjERIBLAZBM1aMCT19s8M8IUMA6hwvV0oaMHCUNPRTRVLEe4jutQeIRpWDd7YASYgHAjgyTNYR+40NpKfpl2SlK90C+C5iUzCK8mrMUjPgzi6iU7aaAYfR1Nux4gX4A9jw5YvOExUyj08isbOGY9mMF4MMtPslZ3nqBWbgadIE6Dpz1kK918WMirdrcXY= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(192374486261705); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(6040375)(601004)(2401047)(5005006)(8121501046)(3002001)(10201501046)(6041248)(20161123564025)(20161123562025)(20161123560025)(20161123555025)(20161123558025)(6072148);SRVR:AM5PR0801MB1972;BCL:0;PCL:0;RULEID:;SRVR:AM5PR0801MB1972; X-Microsoft-Exchange-Diagnostics: 1;AM5PR0801MB1972;4:AN5tcUcGNWt9yix0g5luMB8doLvtQbJ1XWiCIcPDRKf9ofF/icgYl1jNP/+cEXzgIv8bAllHM15hIJcYcdHsq6VH9WnhMXHMtjTWl6LkVSJqhfmFJT0JU6ZOYiD92ShZMr5kVggrBZEJoqJBU/WK3FV0OX7D8QF37EzctFK/vRF1lLSCUF6JRJZbu8m80vArZPi6tkExEYv+Bv2He8vgD80UVxyX1j8C/0gN/fQac7H3RZmgfkYJK51nYFwFI3PZS9W0jJlp3lDyXeOjaJLHEXNTHBp8kxjmvVl6YZGLzwkhT0iapITaNl0Knze1IYEfJxBXJgLqufwxr7PCXiymEVpQKKEAfTRx8tugymkZnktQN6Bh3KdXvKFjQWesDMFz6INicvcv+fOnpbE/3/+/Ki9rx3ZdxWYaIQ9X1g6s189dHfdUY4BXMLpOqlRccAX4MtkrXbk+y2vuQ28S04ppOGDP9flwgdpO5PSVprjiTIa4+z4u/RGnnbQTtWA8ryr3uDxQwVywJt51ttlJOKCA3uYrImerpLKF51qw2N8/dWTXrhAXNEu1UCwvQslEoc50lcS6PozGorV3KeEfzLYXhrV9MJtDVjfnWw4QUnwS/rqC8sTVrgTx6xZonz1lIlGBFaZdBb883iOAvr7no+jC3A== X-Forefront-PRVS: 0218A015FA X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10019020)(4630300001)(6009001)(7916002)(39450400003)(199003)(189002)(24454002)(92566002)(81156014)(66066001)(4001350100001)(81166006)(50466002)(68736007)(8676002)(101416001)(97736004)(1076002)(47776003)(23686003)(69596002)(189998001)(2906002)(4326007)(6116002)(83506001)(3846002)(6246003)(110136004)(53936002)(86362001)(6506006)(38730400002)(55016002)(54906002)(50986999)(7736002)(33656002)(229853002)(106356001)(105586002)(5660300001)(9686003)(305945005)(6666003)(2950100002)(6916009)(76176999)(54356999)(53416004)(42186005)(25786008)(81003)(18370500001)(26326002);DIR:OUT;SFP:1102;SCL:1;SRVR:AM5PR0801MB1972;H:outlook.office365.com;FPR:;SPF:None;PTR:InfoNoRecords;A:1;MX:1;LANG:en; X-Microsoft-Exchange-Diagnostics: =?koi8-r?Q?1;AM5PR0801MB1972;23:sL9Scy6SQPf9emuT3mNJL/B7noFDQFwcDpcdvy66D?= =?koi8-r?Q?203oQ3+3faxMHIJzvQJFW/sh3+MRjHnrvlP0BwgOo+tJ4q7xdahfrD7FOVHTEo?= =?koi8-r?Q?ITH/4IFtY+kJy/ZlAReRYmMAJRnPeRRVQ9HW1/UB2THmFH6CfuGWuiFOEuYIgk?= =?koi8-r?Q?MEhGztCbcaWLv2gx4qblMvBMPkOqqHti7MxNxw4UBK3i1Z/W0/SKeCvwRjpz7l?= =?koi8-r?Q?rEs/9a2DW8WY/YM1XZ1Nv5yojQ68Wh4eMNhmQ1nmhB1sjNbt9c4mu7oNHiGvEU?= =?koi8-r?Q?/iHwmhcqIbLKgyXp/r+5ucqoo946Ryavh93JwDqOpiLcn54AcMjdZNSXCUBMb2?= =?koi8-r?Q?A6L1dJVpE9OcBje8LMaScqwRIiE/tJS1MIfMmT1vmqaD7IfsOnLRpR6MJ7NNOv?= =?koi8-r?Q?BegLfgywCX6sTwOVbpliOgpCjJL6GBfI/iXgU4HIX0lmrjNIX1SRkBUuSqGypK?= =?koi8-r?Q?DpTt25y7h8w1gM9CDy9DfKYrm7kgAtjQsP5ocxInvCvBxr6bsCKU3hRYnjBDJA?= =?koi8-r?Q?SyMrSbAixH+whWVFvzJYUO0edGh5hpSWoZuwaWyYzyBJpE9gLhuTOPhCxrDgFH?= =?koi8-r?Q?zL+47PoMV32ioOC3WZpLx166Lz6lO6V7yLWBEGxxpQN/FpI3mw7/zFl+FXVShX?= =?koi8-r?Q?a5GkKLAYzq4hllCWsbJ99SBTGkDxITL1twVDtNKrlP82Oiq+3mhhJ83nWDmABy?= =?koi8-r?Q?s5pk7O6VlkFQZI/nNBXjrnOZUhuq0tsHbRuZfXamWMGMIzgF0+P82jFTxbR8yS?= =?koi8-r?Q?c/KwCOzSuc/tWka7pol8lfHGvq1+t+nFwe7/n6/n6ZmzY+GQhpjuMtImCWqmhA?= =?koi8-r?Q?5h+9C8nGOz3X1iwnME2G/TO2eJFIYidX0gjKGoF1Hftsh1iuYM1Hmncl+VIAxJ?= =?koi8-r?Q?u7ObQfum15brVmE1Pr2hTfjCzdKCJ2oEwvHPxsjRuAGh+au4+a+M/p08F7IKRr?= =?koi8-r?Q?Sb14iftBxkLCfu186z50sCq7AVn8MtlG9o2GYwu6PMiIpmkHCob8avtbO4pC1V?= =?koi8-r?Q?RN2TiPpTqScrtgn8PduacHKPqMxYsANWA2CYvf0vTfZrXlrA0503PiHPEr7R+4?= =?koi8-r?Q?SjrEJ54HisxHntA/DDsH4+gdmBgSHXOZvqpZjZ6XAM4Ct6GL9V/iC61gmrk9vp?= =?koi8-r?Q?xzFq9RAB0gTTP8/dtK9FsZ2yn0RBp2T8VSr0eOMo8d6vy62h7Hwiu8QePRBz5B?= =?koi8-r?Q?1pbWBQzGnLQebcTADFsQJsnOIJq39P1uEEkcPNIVEum5SaPVd1CmiR+TxBaShS?= =?koi8-r?Q?5AagCTEWSUCUExL+jS3jUKYCsuE1ZFGTLkQbJJQMkM=3D?= X-Microsoft-Exchange-Diagnostics: 1;AM5PR0801MB1972;6:O+d1/S91aAVkd0y2kZboSfSnnqjXieqvlkS0kTaiUB6IEw9NVJbfegWKEsvYe9EtTJfbWWTutocC1yv1XhNS2r86pj3/2fNNfYkvq4V/1GNG4xg2bs9WZZ277zcDQshQthwNTCVNyhPesr7spBj5GUS++b8SBZMjIMEgZ3T5dVS6rHo+lBmlwalJ9cs4FpFolJT8ZnS88h/fX83S05mgShiYQXo1cQi5C6Q5Ya64rGi2kvFfqjYhuP6lcAUslAojJrtgrIQShPKyfSUIZBSz7Azn/2RWsgL/pXJh4JiIDQQlL7g8nr5VlzydytMrhIdbNQJl0styz0vJhwnwqe0XuhqCOV15vGBuzv2YdNjA2YpZiCtucN+WLh8gmEFHuPnjnN9phGAt0uWwbSRC5Y62MA==;5:88D0H2ZRe0BW2tI3wqF7oPHO7JWPAy42VA3kXnwiVtXRyI2a4ajvK1d60VLtIMQuSyYVvQ+aRqgqREKTqC0V/RuQGrMIELmV5QboYEEE80yu13seT/bIAOyZNxJpMd6qKlhzd2YuKHr6Q2MuoSwH8A==;24:Mdlae+zQRiULaVfJS2bW2x5jpDr1LgQb9SJxiR8TmR57P3XL1SlUEmjTLHBWoye3HWz4tKFBs9Eb7ES2xgcQd+bMxqCk9i3jNOMexuKnogU= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;AM5PR0801MB1972;7:wAhEa6KnHvy/M+KHT+1HxgUbGIhAqInKD6pR5yOTWcPadMvk5qr73JjmPQfvC+e40xn6K+sHvmEMhUPV2SBrSJV1ZwoqLwyK9lMDwoQiqsz9pBPn4EWMq94Wc8zmtncRWaMyv4GYXmyVu9S1EUxD0UmCN862ZoG3ld62htxt/pRt+XGRNneOB9e/coIMcO1uOqqywNd01Oo+YjQttY8w6sKxRazpQS5a/v3m+FvFsFz2olFMgokOYWrZnz/xti3XK24WDXKqQHoe+cu8dqGcXFNvp1TTE6juHFWICVmCYcp2BO1prfA81U/0UQbPd3PkCKoofTNWLH00xaber4MChpLtLQAsYfLKHfUFVGn7HTu9fJAFyZ99RHOWm1TX49oblabUTQYg5FkkYJK08GUU+CBMV3v//xhWDhkl4h6y7cFPm1HSVTu4Q8+wkclgEqB6pR+2qh5TJP1hGcnDFaR2IBSMRWUawyIzxX+/JfnhZU6bZKxdY6/X/cB7DMp7Umo8RZmkiJn1ZWdX83wNKL1vIQ==;20:2uywXeIXnDqk4L7qUnKb2/x2cHgHYc0I6JNAoqaYUMLtU3EZhbbf3+gaRgILv4a2v7jwfMcOel1uqETRjecaKNKc7iti0hPZF/VCYfG9DHBQmjVIlpfOYPsEBXklXMUwzxIQrlvv8iMW9fbHX+6u/+6QTGBrYPguox6/8gfPn18= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Feb 2017 06:37:36.6246 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR0801MB1972 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Feb 07, 2017 at 03:18:51PM -0800, Kees Cook wrote: > The SECCOMP_RET_KILL filter return code has always killed the current > thread, not the entire process. Changing this as a side-effect of dumping > core isn't a safe thing to do (a few test suites have already flagged this > behavioral change). Instead, restore the RET_KILL semantics, but still > dump core when a RET_KILL delivers SIGSYS to a single-threaded process. > > Fixes: b25e67161c29 ("seccomp: dump core when using SECCOMP_RET_KILL") > Signed-off-by: Kees Cook All CRIU tests passed with this patch. Thanks! Acked-by: Andrei Vagin > --- > kernel/seccomp.c | 13 ++++++++----- > 1 file changed, 8 insertions(+), 5 deletions(-) > > diff --git a/kernel/seccomp.c b/kernel/seccomp.c > index f8f88ebcb3ba..e15185c28de5 100644 > --- a/kernel/seccomp.c > +++ b/kernel/seccomp.c > @@ -643,11 +643,14 @@ static int __seccomp_filter(int this_syscall, const struct seccomp_data *sd, > default: { > siginfo_t info; > audit_seccomp(this_syscall, SIGSYS, action); > - /* Show the original registers in the dump. */ > - syscall_rollback(current, task_pt_regs(current)); > - /* Trigger a manual coredump since do_exit skips it. */ > - seccomp_init_siginfo(&info, this_syscall, data); > - do_coredump(&info); > + /* Dump core only if this is the last remaining thread. */ > + if (get_nr_threads(current) == 1) { > + /* Show the original registers in the dump. */ > + syscall_rollback(current, task_pt_regs(current)); > + /* Trigger a manual coredump since do_exit skips it. */ > + seccomp_init_siginfo(&info, this_syscall, data); > + do_coredump(&info); > + } > do_exit(SIGSYS); > } > } > -- > 2.7.4 > > > -- > Kees Cook > Pixel Security