提交 c4f103f6 编写于 作者: D David Rientjes 提交者: Greg Kroah-Hartman

kvm: svm: fix potential get_num_contig_pages overflow

commit ede885ecb2cdf8a8dd5367702e3d964ec846a2d5 upstream.

get_num_contig_pages() could potentially overflow int so make its type
consistent with its usage.
Reported-by: NCfir Cohen <cfir@google.com>
Cc: stable@vger.kernel.org
Signed-off-by: NDavid Rientjes <rientjes@google.com>
Signed-off-by: NPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
上级 93d60348
...@@ -6398,11 +6398,11 @@ static int sev_launch_start(struct kvm *kvm, struct kvm_sev_cmd *argp) ...@@ -6398,11 +6398,11 @@ static int sev_launch_start(struct kvm *kvm, struct kvm_sev_cmd *argp)
return ret; return ret;
} }
static int get_num_contig_pages(int idx, struct page **inpages, static unsigned long get_num_contig_pages(unsigned long idx,
unsigned long npages) struct page **inpages, unsigned long npages)
{ {
unsigned long paddr, next_paddr; unsigned long paddr, next_paddr;
int i = idx + 1, pages = 1; unsigned long i = idx + 1, pages = 1;
/* find the number of contiguous pages starting from idx */ /* find the number of contiguous pages starting from idx */
paddr = __sme_page_pa(inpages[idx]); paddr = __sme_page_pa(inpages[idx]);
...@@ -6421,12 +6421,12 @@ static int get_num_contig_pages(int idx, struct page **inpages, ...@@ -6421,12 +6421,12 @@ static int get_num_contig_pages(int idx, struct page **inpages,
static int sev_launch_update_data(struct kvm *kvm, struct kvm_sev_cmd *argp) static int sev_launch_update_data(struct kvm *kvm, struct kvm_sev_cmd *argp)
{ {
unsigned long vaddr, vaddr_end, next_vaddr, npages, size; unsigned long vaddr, vaddr_end, next_vaddr, npages, pages, size, i;
struct kvm_sev_info *sev = &to_kvm_svm(kvm)->sev_info; struct kvm_sev_info *sev = &to_kvm_svm(kvm)->sev_info;
struct kvm_sev_launch_update_data params; struct kvm_sev_launch_update_data params;
struct sev_data_launch_update_data *data; struct sev_data_launch_update_data *data;
struct page **inpages; struct page **inpages;
int i, ret, pages; int ret;
if (!sev_guest(kvm)) if (!sev_guest(kvm))
return -ENOTTY; return -ENOTTY;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册