From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6F8F3C47DD3 for ; Mon, 22 Jan 2024 18:33:29 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id DF2746B0092; Mon, 22 Jan 2024 13:33:28 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id DA2B26B0093; Mon, 22 Jan 2024 13:33:28 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C1BB66B0096; Mon, 22 Jan 2024 13:33:28 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id AF4356B0092 for ; Mon, 22 Jan 2024 13:33:28 -0500 (EST) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 89C68A1DB1 for ; Mon, 22 Jan 2024 18:33:28 +0000 (UTC) X-FDA: 81707794896.02.90A1BB3 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2046.outbound.protection.outlook.com [40.92.89.46]) by imf11.hostedemail.com (Postfix) with ESMTP id ED8924000F for ; Mon, 22 Jan 2024 18:33:24 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=none; spf=pass (imf11.hostedemail.com: domain of bernd.edlinger@hotmail.de designates 40.92.89.46 as permitted sender) smtp.mailfrom=bernd.edlinger@hotmail.de; arc=pass ("microsoft.com:s=arcselector9901:i=1"); dmarc=pass (policy=none) header.from=hotmail.de ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1705948405; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=WkLkCMGS0Kslf9FUZQDS7mtYKmevNVfHKUnmnRDYttI=; b=etRB9C1zANEShYsmBHmaTCmZa/5WfQD2HYD3LgCqp2M6rl0LZ5VD0/dVGV9BI1Rbb0nZSC 1giymnLQKvAmz0d+TylcDzvpOE0jVyWxl0PdkL8uLa9zfECHFGuaAxEzlNkDixXqW5cS0B 593itBtUTLH1iuFy4J76TyOzYyZx5fQ= ARC-Authentication-Results: i=2; imf11.hostedemail.com; dkim=none; spf=pass (imf11.hostedemail.com: domain of bernd.edlinger@hotmail.de designates 40.92.89.46 as permitted sender) smtp.mailfrom=bernd.edlinger@hotmail.de; arc=pass ("microsoft.com:s=arcselector9901:i=1"); dmarc=pass (policy=none) header.from=hotmail.de ARC-Seal: i=2; s=arc-20220608; d=hostedemail.com; t=1705948405; a=rsa-sha256; cv=pass; b=ohWoAsMycD+VQQmoNfhepmAt/ZGcwC0qIK4JijO+G2Rc+G9YDt0w9LEPeQbFd1pNqFOT+R eOFc8/21EwaUhfedepQqRdF5IPvLkvtaHxc0yYhuJQH4z0T0XAvFGCV4Ok4zT4EcD2zkiR 2HUgNz5xa4wb3dtTQQu24iBOpPXZels= ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jkOdTRwSE6+PIQIH4NYVDoXe90P+bT856Eg6iELqh+OIu0gWDikP0T19jJ1uPF1EWcvW0qVvgBwkNR1ZolQOupqP1B6QxbCJaltt4ocofTVUdE7BTBRfW2p3t/6knwFeEguQe+VLZN9y6Rr1XybMJwrgvoXC6CKydKmUadXo724EV7CDQqk/EEye5c4mtwKIc3uJTl8E/CDVINNH5rOb3En8YFX3k4gLa1tirXiZwLFRDw+H9AnLJskwhVXf1+yJjN4RR68g9TyKXwldQKzNlPEUqUXyC6WWXsejGY6XmHe/LN6XnFvwCIJL3LGOy9KHn4pXBOHJJ/A9flUuGJytAg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=WkLkCMGS0Kslf9FUZQDS7mtYKmevNVfHKUnmnRDYttI=; b=hbDK0LcsR7lawkduQtpnV63zn7KkogsCdg1k6N6x6Vl6Z2CyEVs6tBDZCTDRP0VHA4Cdf2hLNpUxtr4/UA7EKbugBjki2ggzoBinPM5qLa0n+5YbUFaPIKMnFRTUGh1J6Iy9ze2+uQiu/j/ILngLD1X5c2mXhez5m7gCXxKKMx6VBCvBjIHW9EF23EamhaxtH0+FaKe/QDms+UVTp6s7sC/xmKgGIE9bIJlYULEtf9LeFRTojTLLTG6bvN23nKs8ECqtkQgrze6DOyaOfJgYhzqfMdiVd+pju4UvLU0pP0WB+aHnsUPHPQOJapT0h1WRbiF8tzepiGrCLC/s9RJ1sw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none Received: from AS8P193MB1285.EURP193.PROD.OUTLOOK.COM (2603:10a6:20b:333::21) by AS8P193MB2111.EURP193.PROD.OUTLOOK.COM (2603:10a6:20b:44d::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7202.32; Mon, 22 Jan 2024 18:33:22 +0000 Received: from AS8P193MB1285.EURP193.PROD.OUTLOOK.COM ([fe80::897e:cfd5:b29b:c611]) by AS8P193MB1285.EURP193.PROD.OUTLOOK.COM ([fe80::897e:cfd5:b29b:c611%6]) with mapi id 15.20.7202.031; Mon, 22 Jan 2024 18:33:22 +0000 Message-ID: Date: Mon, 22 Jan 2024 19:34:21 +0100 User-Agent: Mozilla Thunderbird Subject: [PATCH v3] Fix error handling in begin_new_exec From: Bernd Edlinger To: Alexander Viro , Christian Brauner , Kees Cook , "Eric W. Biederman" , "linux-fsdevel@vger.kernel.org" , linux-mm@kvack.org, "linux-kernel@vger.kernel.org" , Andrew Morton References: Content-Language: en-US In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-TMN: [FGDY1yHzdZc6FFv+Zt52tbL3ygr+LKpoOcr/HFmWL0igZMlPLETmsvVpaEXSjg6t] X-ClientProxiedBy: BE1P281CA0479.DEUP281.PROD.OUTLOOK.COM (2603:10a6:b10:7e::23) To AS8P193MB1285.EURP193.PROD.OUTLOOK.COM (2603:10a6:20b:333::21) X-Microsoft-Original-Message-ID: <1656ab24-26f4-4572-8bfc-663b533db78b@hotmail.de> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P193MB1285:EE_|AS8P193MB2111:EE_ X-MS-Office365-Filtering-Correlation-Id: 59987384-b291-4ad9-0ba0-08dc1b789cad X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 1esE7zODz6EQvuNjGr+whIqrgLTYUoN/wLktW+mrjG5HP+1Ri+7rRIrQp3RyhMz9eQNEofwkI8C8tuh0lOP1iTeEydh2bONLWQ7EatyH3Ma8YMvzIA9en5+0yssdRhCC8LDTbkBMTvxqWkzrXGypTe5ckz/dbjeZWh71e3I0nfZzhq1chVqf5iXu2YuMFVIxX3sa5rKY8UTVyvyTWTCyC5KuD/a6qA3iysOcWhWHo2no6jPEGjTmwLMUaBb2inPyNvqGqeqMcnez+fjleK0JtYVlj6C+e+TbO6BxX0l7feS1iZAI0Rj9RMtrBrBUIm88iEhZVEMmGHAD2YHrrf5PydVFa89aKO8A6t8sH6eaQw99cNd0uUSvfQfTd8gG6CrAxv/MduedwBmYcOlKIcXo+Kwn1x6F1qc5C1H08adQSClyTI3Cw9IrZGb7vz1mLun4Q7OLBqVsQy3oWIMyGX8Bsr2zoao+KWTLMXvLBHDXfUfw8oEsyNTc1Kaep995A5R8lRmtCnbpZs2H6MUf5dhdcVW+gwGY45mzfubIt8eUgNpGw2Oqrz8SukLDhrFcLKAa9aOzMLT3tf45R6A1FZ6p/RR31MpiRY7CG1oo510P2NE= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?akdybzU1VGhaKy9heERWT3kvUzlvTkxOelBQY0N4YVF4MlJodjV2V0pnWnFP?= =?utf-8?B?NmtXTDFtNGtnZUlMdko1RS9wZWN3SWw5dTFYTXU3d2dXSHVmQVhkQWw3eG5D?= =?utf-8?B?akdIZ2ZRUHF5NThSNk5TdExsSzV3Wm9lMFp2ZHdCOHFLNm1nMzBJRnFVaXNu?= =?utf-8?B?ZlF0ZmIyWUZ2Q0xtZDlRNDY1UG9wTlphTGtReE5nV3RBSFVZZXBQZGZia091?= =?utf-8?B?RTBYMWEvUTZSMjIrS0pJcC91WXY0dldLWGlPajJod2Y0RXJLUUhEc0ZaVmRq?= =?utf-8?B?eVFabmpzcGYvSEFJdDVMWHFhR0d2SnlQcVo5K1kyNnFYSWdkb3lQUWpoK3dn?= =?utf-8?B?RnNISG5Zb2w2TEpHTWQwd3pFUDNOeDF6aEhaUG92anpkZ1VnT3p1K1pNRmY2?= =?utf-8?B?S1A5K3d2a2JoWWlpcUttelNVOGZoMlV1TVBWMy8yeXI4TC96dzJ5WWN6aCt5?= =?utf-8?B?ZnBrQUtJOEUrTVFBYTJCV3AxcDVzV09tUnlXamQxbHZONEhqYzJxblpEVFox?= =?utf-8?B?ejFHL3JRbjR6SjRmaW1Ld2ZKS1h1bDBHaDdkdGJMUGRjVVhaVGI0UkF3eGFu?= =?utf-8?B?M3BLTHBkQjNiaG02Y1pvOUdxOS9rdmRraHpWMk5WMjhKWmNzSTRhT2llUWZO?= =?utf-8?B?emdHaGJaemxZaUhRUm15ZE5YMFV1cTdVMWJXcUppdGJQdXJ6OS90VVlZMjNm?= =?utf-8?B?OTRpT2FzcUpEUStxTWR4Qm41R1NVVFNhMFV0eVZDRGNPRmhUNFpoRG52SSs3?= =?utf-8?B?OFJ3a24vVHNwbGhicDNWM1JKV1FkT2xmSEw3aU56TUU2YTlyemJPWGVmaGha?= =?utf-8?B?YkdGOUVudXRpdk1BRkxZdTVLa0ZTMkZjMXE3ME5sOWgwdm41cHM0MlFHU2l1?= =?utf-8?B?bW5Od0g4YXBuaW5ZSjBTQzl5eEFWOS85NzFuS29yM3IrSWQrRzNJWVp3bm5Q?= =?utf-8?B?UlZqWmxyL3hmTkRUN2YrbFRIVEdyeE1IRjF5ZHM5Y1VjcXRVSEJsSXprNlNJ?= =?utf-8?B?MWFOYnBNRWdEdHh3YWYwRFE5bEp1NUV6aWlWazJodTlZOVpxUHFjelJZb0sx?= =?utf-8?B?YWpyWWdIeVV6Z0pleU9ici9zZitnbTdVeEh5U2FyZU1KSDZCcE1HRWw0TU9l?= =?utf-8?B?QXp1WEJnUnJRTmxnSm9peDVsN1NzS3FpNXFwNllHWGl2a3VPTUZPZlVFVGdQ?= =?utf-8?B?a1pxREUvTlBMR1VIeVRVNTBlb2hDaEhJeEFId3pnZ0d5dFR0eFZIczV1S3Bp?= =?utf-8?B?cURUS0MxTkdyRXlQdlNNSmdvRUE2YWpmU3VPZ1drNjhRZG9JWTh6UUo0NW0y?= =?utf-8?B?V0dnMTZqZFFQbFFjZW5sYUhDdTg5dS9vUldJSGpEd1pMa3JQY3Mvc21IazhQ?= =?utf-8?B?R1BHTnpUNEZNSzk2MEZkR1pXSGdNSDZCWUp0MnBiT1pKY3VYQ3ZnczByaDkw?= =?utf-8?B?dEpRSzdDMWxmODBmNjZFM3F2Q3hiVHRRcFdQWXRUMG9oWFQxbHNtb0RWL3F0?= =?utf-8?B?NGtMRXNVZzlVQXRPZGhWS0tjSS95Y0RNakE1UlR5TGdBTGg1NVhrYkt6WUxE?= =?utf-8?B?alpKZlRFZVBZcUcxWnBWMXZ0eU9ncEZhQ01CNGF2aDJMQUtsNSswaVppSDdZ?= =?utf-8?B?czNLWFIveXZFMitmalRML0N0TWZyRkc5ZjZkNW0reDA1ZXM4OFhnc2p5ME13?= =?utf-8?B?bzE1dGJ1MmtzZ2hoUzN6d1doSXpvNUlPN0FnajB6YWFsTDFnc1RqZm0vOTVo?= =?utf-8?Q?/UyhavO8ZZ4Mbt61ig=3D?= X-OriginatorOrg: sct-15-20-4755-11-msonline-outlook-80ceb.templateTenant X-MS-Exchange-CrossTenant-Network-Message-Id: 59987384-b291-4ad9-0ba0-08dc1b789cad X-MS-Exchange-CrossTenant-AuthSource: AS8P193MB1285.EURP193.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Jan 2024 18:33:22.0774 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8P193MB2111 X-Rspamd-Queue-Id: ED8924000F X-Rspam-User: X-Stat-Signature: ybouzjudcupzjg9nrfqbwk75dtjbasab X-Rspamd-Server: rspam01 X-HE-Tag: 1705948404-610618 X-HE-Meta: U2FsdGVkX191i2pG9VF1YaW/u13MmibC0JY4pSESortvQC+Q4o9qmbyBb/SuS5lrUUg+ykcEPufp1ObwPdLV9PzhqIMNC4iAaJrZW458QDEb8q5KJfGNxgA0R9x4EmcrvFkTTujC45SvFFYDJyJkT2YY68p81lnrGyku3Jr+SiGbn1e6h8PZmZrgH92F0O+GfraY1mdhZxZEfAwa8sVvrQsPKJ59DCQ1VuwGXGLyLy1B9gvwRt0cvjNAkoe3Lq/3BZpnmvmCXYmuNKvCAUpSsB4CORbaFs0P1P7BDXpEhEzGGtvvq0FcOZyvJIJLNzqnFEL+BE9ksKcoqiMAgwbJAAZXn3YzBlRDSk10k0lU7348WxIXviXgcGQCObYhS3Soa4eRAyyw9Lm9HxOFcw+bWYEsiCZI8YC9A8bdq9FGZcEfvAoWM2F6jEHdF+NQhpdUR9YCl1qKtDKM9oEH4qHaZ71ixvrIaAcHFZnCu4AfMgDRMf8ibSKrgXzEhZdS7+0xvYHK77D4o5Csg4EEHB1OSR0a1jalFMef4UpaPZ+4KpRMfK2oIVaH3UGi4bC9F1NPLJV2hay+kT0Hdsw+KmAoxyOugGXgMIF1nwoCEvDyeM0abJaXmoGVZhwc596K/yHFt49ylymPTWp+PJu7AW6lidrfO22/tXwlH5Kn/tiybwgrPULtJ2fkmRc7oUnGCNofPuF7SEubM1UxiTHpm2X3LlSWUlbBl9MvYCwgaRiJAuAuIODlZoLOFTLxRqQzKR/mDG5fqRAc0rMvuX1cJE1f2hyyVKgAxRtYc/B3cfBJTcs0Rfw3yjAQadnlQBgUViqib2FUn5KRMDHhlBr12rA3bY+GnI+NKzoVjNlQVQ/CGh+KRTb4LKTCP1XzzzeCqwvNK+s8eFJP/FRlxIAsspTYLA+c2/Yk1HJMDRSY8OHUR5VpR6LEyzjf9N7bvtDPug6mKBQ15ZD/WzU0d7eLyC5 unA== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: If get_unused_fd_flags() fails, the error handling is incomplete because bprm->cred is already set to NULL, and therefore free_bprm will not unlock the cred_guard_mutex. Note there are two error conditions which end up here, one before and one after bprm->cred is cleared. Fixes: b8a61c9e7b4a ("exec: Generic execfd support") Signed-off-by: Bernd Edlinger Acked-by: "Eric W. Biederman" --- fs/exec.c | 3 +++ 1 file changed, 3 insertions(+) v2: rebased to v6.7, retested and updated the commit message to fix a checkpatch.pl style nit about the too short sha1 hash in the Fixes: statement. And retained Eric's Acked-by from: https://lore.kernel.org/lkml/87mts2kcrm.fsf@disp2133/ v3: removed empty lines after Fixes: and Signed-off-by: header. Thanks Bernd. diff --git a/fs/exec.c b/fs/exec.c index 8cdd5b2dd09c..e88249a1ce07 100644 --- a/fs/exec.c +++ b/fs/exec.c @@ -1409,6 +1409,9 @@ int begin_new_exec(struct linux_binprm * bprm) out_unlock: up_write(&me->signal->exec_update_lock); + if (!bprm->cred) + mutex_unlock(&me->signal->cred_guard_mutex); + out: return retval; } -- 2.39.2