From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-f179.google.com (mail-pg1-f179.google.com [209.85.215.179]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D0FCD78F59 for ; Sun, 21 Jun 2026 09:02:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.179 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782032566; cv=none; b=gPcY9LblzEAfWPXsLHGjSQ0iNr7xvBHauCk2twNfh326nG4tTDuQHa7mu4z3xa/RF8riV9sbSr9N1JS/kzMfJPOWXB6M7ZLxYIuhOY1DzLXWFMaNI3jVHJNe/A9CfXm7+CsswT3j857zZuI0kk/y6GUgcYSuytrP7NBeso87b20= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782032566; c=relaxed/simple; bh=r/FPwUi6yQ6VIsUdeIY1RzepnCjf4B6iWn7i8PjK5gQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hdg6rPnOFEFmHKtqLzNBj5ptZdxBDAXRzIgIIrY8SQdWc9Mors5c79kHhz61cKA+jn0c0JLlqjeFfirRTaTeWJDUHda2e8JwRFm+IM8TervTyk6EfqRyw8RRfIms1u76TrU9cInsUXSo9wUwB2+iXqb/ePJS05IwIQ8vTjlBuNg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=HmcXzcrU; arc=none smtp.client-ip=209.85.215.179 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="HmcXzcrU" Received: by mail-pg1-f179.google.com with SMTP id 41be03b00d2f7-c890110acdaso1334705a12.3 for ; Sun, 21 Jun 2026 02:02:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1782032565; x=1782637365; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=s/ALkiZuCczX/db69WeBTfJh9iKdw4FEbvcclhIGhUw=; b=HmcXzcrULaLuwNKxv24HQV5GkRLlCpp1t3K1YyA+V/pb7G4JsCcKavxHe78JIRP3qz 1/rEJ0boQ3VJQcM820ge7MYSE5plLbwNazEPDhFDdcoA8nJbCUzwwPKmpXePWbWBcGKg ciY2kS21/Edb3ceuLcz8N0eqoFSlyt8FyMLo0P/UBB9Kuq0LbQH2Wa5xixc+qW4an7MK N84IQ9WpyoFLzHi6jqMSnll3CQ8ZT3VGhyq543GHgOJVpiQcKl9RXJyE1JsrhyEXk8Ng Yz65mMAvMa+koC/nKw0IotJ4CN9rSoXrj6afKsPRF/xG7+M4vqEZ+qX/E8P4h4/6xSvN gRPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782032565; x=1782637365; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=s/ALkiZuCczX/db69WeBTfJh9iKdw4FEbvcclhIGhUw=; b=fiDWK0Ly0hDIK779qY97mPQ3kfXfugg8CrSw8ECklg+yrrFbAkH0BooIiq91PtVDlc Xmt71cXGU+QnvYUF/jQ5GwaHrmbEimowlbyYDvGP1TgcOYxo2Hl8uv8mCWuQ4VWct5ht D3oBsonYFLYDFv8tHvnIlWLQut7LNYvmTt56wQwq6qLUgvJIPLVNNUqhtup8tbL2L6LO paESVRCz6ed2BVLAvyAnHH/G+nakoUBTO7cbJ5NQKmsy/0A5LX1864O1G7+2v61jzAEd wo/nxxDaSWIwDhXVOJiNL1wP1IT/LWshYL6y/s04x0HL70SGYxNxOLM0pFlv9wcVfcmi DonA== X-Forwarded-Encrypted: i=1; AHgh+RqarAb7cGPeDwxlaDNXbnubuKUoHdk3ifWXt9SG0D/QZhnufSGT40uJkfUn2XZ0RH4miF7QCYtF9yjJO4g=@vger.kernel.org X-Gm-Message-State: AOJu0YxnZmM5w62tmsbQz4AfMTiHazg/wVGY2xa/EW02/8I+nh/bU6Gp pahXbZ2+Y0INz3TLEJoNnioxJoi+iO7qkKW4Iz05Wv7aA4DjRkamw9zq X-Gm-Gg: AfdE7clLBCoksCS+FDRIhsHO7ZJThyuJnyPtd7zdT/DRghLA3Uws7uWbNycGUPLEUUp Utun8fUzF+uK68cg+kgFwezgN7/AxB1uAp/ujaGvOmo1bi1QyM7cLRHKiKc9UjTLoRZVQ68lQz3 WbFlIElcueQwv6MQTaLdRTDKKOWgDRQLdIBVzPphUb3NBr7ZgJ+31ylSEAS5Lgl+jYaxx6kZZfZ FkGt6wwJdLT5frvTne/RivDVxg+ACSI84s/NBUvne7pcXDJhZbtTU16DGiqttSDRBGOXk8cvaC5 eJ3IQHCZCU2Bh4XLHq1JjUskhOMhiQABbZRyG6ZxX/DwYZWngILW7giOkGzgwy2n3kBaiCEZGNl lhExK9mkJT2/+murtpBB9MWKM5pMcR+1LxTHWRMlFEAHqvNLlH9nUQa+2i+58XE8aI+vcWPusFS q+ZeSulfIU0FIckf7YVqM9DrHquAdfkW4+ X-Received: by 2002:a17:903:4b4e:b0:2c6:d710:3e58 with SMTP id d9443c01a7336-2c742b79e68mr61671415ad.36.1782032565138; Sun, 21 Jun 2026 02:02:45 -0700 (PDT) Received: from thefless.lan ([171.246.213.55]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2c742fdd411sm46958055ad.0.2026.06.21.02.02.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Jun 2026 02:02:42 -0700 (PDT) From: Vu Nguyen Anh Khoa To: Alexander Graf , Arnd Bergmann , Greg Kroah-Hartman Cc: The AWS Nitro Enclaves Team , linux-kernel@vger.kernel.org, Vu Nguyen Anh Khoa Subject: [PATCH 2/2] misc: nsm: do not unlock mutex before locking it Date: Sun, 21 Jun 2026 15:57:43 +0700 Message-ID: <20260621085743.76329-2-khoavna.tin.2225@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260621085743.76329-1-khoavna.tin.2225@gmail.com> References: <20260621085743.76329-1-khoavna.tin.2225@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit nsm_dev_ioctl() jumps to the common out label when the initial copy_from_user() fails. That failure path runs before mutex_lock(&nsm->lock), but the out label unconditionally calls mutex_unlock(&nsm->lock). Return -EFAULT directly for the pre-lock copy_from_user() failure so only paths that acquired the mutex release it. Signed-off-by: Vu Nguyen Anh Khoa --- drivers/misc/nsm.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/misc/nsm.c b/drivers/misc/nsm.c index 52790df7d..8153edff3 100644 --- a/drivers/misc/nsm.c +++ b/drivers/misc/nsm.c @@ -369,9 +369,8 @@ static long nsm_dev_ioctl(struct file *file, unsigned int cmd, return -EINVAL; /* Copy user argument struct to kernel argument struct */ - r = -EFAULT; if (copy_from_user(&raw, argp, _IOC_SIZE(cmd))) - goto out; + return -EFAULT; mutex_lock(&nsm->lock); -- 2.43.0