Skip to content

Commit ac7c06a

Browse files
nikunjadbp3tk0v
authored andcommitted
virt: sev-guest: Allocate request data dynamically
Commit ae59661 ("virt: sev-guest: Reduce the scope of SNP command mutex") narrowed the command mutex scope to snp_send_guest_request(). However, GET_REPORT, GET_DERIVED_KEY, and GET_EXT_REPORT share the req structure in snp_guest_dev. Without the mutex protection, concurrent requests can overwrite each other's data. Fix it by dynamically allocating the request structure. Fixes: ae59661 ("virt: sev-guest: Reduce the scope of SNP command mutex") Closes: AMDESE/AMDSEV#265 Reported-by: andreas.stuehrk@yaxi.tech Signed-off-by: Nikunj A Dadhania <nikunj@amd.com> Signed-off-by: Alexey Kardashevskiy <aik@amd.com> Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de> Cc: stable@vger.kernel.org Link: https://lore.kernel.org/r/20250307013700.437505-2-aik@amd.com
1 parent 14cb5d8 commit ac7c06a

File tree

1 file changed

+15
-9
lines changed

1 file changed

+15
-9
lines changed

drivers/virt/coco/sev-guest/sev-guest.c

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,6 @@ struct snp_guest_dev {
3838
struct miscdevice misc;
3939

4040
struct snp_msg_desc *msg_desc;
41-
42-
union {
43-
struct snp_report_req report;
44-
struct snp_derived_key_req derived_key;
45-
struct snp_ext_report_req ext_report;
46-
} req;
4741
};
4842

4943
/*
@@ -71,7 +65,7 @@ struct snp_req_resp {
7165

7266
static int get_report(struct snp_guest_dev *snp_dev, struct snp_guest_request_ioctl *arg)
7367
{
74-
struct snp_report_req *report_req = &snp_dev->req.report;
68+
struct snp_report_req *report_req __free(kfree) = NULL;
7569
struct snp_msg_desc *mdesc = snp_dev->msg_desc;
7670
struct snp_report_resp *report_resp;
7771
struct snp_guest_req req = {};
@@ -80,6 +74,10 @@ static int get_report(struct snp_guest_dev *snp_dev, struct snp_guest_request_io
8074
if (!arg->req_data || !arg->resp_data)
8175
return -EINVAL;
8276

77+
report_req = kzalloc(sizeof(*report_req), GFP_KERNEL_ACCOUNT);
78+
if (!report_req)
79+
return -ENOMEM;
80+
8381
if (copy_from_user(report_req, (void __user *)arg->req_data, sizeof(*report_req)))
8482
return -EFAULT;
8583

@@ -116,7 +114,7 @@ static int get_report(struct snp_guest_dev *snp_dev, struct snp_guest_request_io
116114

117115
static int get_derived_key(struct snp_guest_dev *snp_dev, struct snp_guest_request_ioctl *arg)
118116
{
119-
struct snp_derived_key_req *derived_key_req = &snp_dev->req.derived_key;
117+
struct snp_derived_key_req *derived_key_req __free(kfree) = NULL;
120118
struct snp_derived_key_resp derived_key_resp = {0};
121119
struct snp_msg_desc *mdesc = snp_dev->msg_desc;
122120
struct snp_guest_req req = {};
@@ -136,6 +134,10 @@ static int get_derived_key(struct snp_guest_dev *snp_dev, struct snp_guest_reque
136134
if (sizeof(buf) < resp_len)
137135
return -ENOMEM;
138136

137+
derived_key_req = kzalloc(sizeof(*derived_key_req), GFP_KERNEL_ACCOUNT);
138+
if (!derived_key_req)
139+
return -ENOMEM;
140+
139141
if (copy_from_user(derived_key_req, (void __user *)arg->req_data,
140142
sizeof(*derived_key_req)))
141143
return -EFAULT;
@@ -168,7 +170,7 @@ static int get_ext_report(struct snp_guest_dev *snp_dev, struct snp_guest_reques
168170
struct snp_req_resp *io)
169171

170172
{
171-
struct snp_ext_report_req *report_req = &snp_dev->req.ext_report;
173+
struct snp_ext_report_req *report_req __free(kfree) = NULL;
172174
struct snp_msg_desc *mdesc = snp_dev->msg_desc;
173175
struct snp_report_resp *report_resp;
174176
struct snp_guest_req req = {};
@@ -178,6 +180,10 @@ static int get_ext_report(struct snp_guest_dev *snp_dev, struct snp_guest_reques
178180
if (sockptr_is_null(io->req_data) || sockptr_is_null(io->resp_data))
179181
return -EINVAL;
180182

183+
report_req = kzalloc(sizeof(*report_req), GFP_KERNEL_ACCOUNT);
184+
if (!report_req)
185+
return -ENOMEM;
186+
181187
if (copy_from_sockptr(report_req, io->req_data, sizeof(*report_req)))
182188
return -EFAULT;
183189

0 commit comments

Comments
 (0)