4a5ee0f11d
5537a4d8-libxl-use-DEBUG-log-level-instead-of-INFO.patch - Upstream patches from Jan 55dc78e9-x86-amd_ucode-skip-updates-for-final-levels.patch 55dc7937-x86-IO-APIC-don-t-create-pIRQ-mapping-from-masked-RTE.patch 55df2f76-IOMMU-skip-domains-without-page-tables-when-dumping.patch 55e43fd8-x86-NUMA-fix-setup_node.patch 55e43ff8-x86-NUMA-don-t-account-hotplug-regions.patch 55e593f1-x86-NUMA-make-init_node_heap-respect-Xen-heap-limit.patch 54c2553c-grant-table-use-uint16_t-consistently-for-offset-and-length.patch 54ca33bc-grant-table-refactor-grant-copy-to-reduce-duplicate-code.patch 54ca340e-grant-table-defer-releasing-pages-acquired-in-a-grant-copy.patch - bsc#944463 - VUL-0: CVE-2015-5239: qemu-kvm: Integer overflow in vnc_client_read() and protocol_client_msg() CVE-2015-5239-qemuu-limit-client_cut_text-msg-payload-size.patch CVE-2015-5239-qemut-limit-client_cut_text-msg-payload-size.patch - bsc#944697 - VUL-1: CVE-2015-6815: qemu: net: e1000: infinite loop issue CVE-2015-6815-qemuu-e1000-fix-infinite-loop.patch CVE-2015-6815-qemut-e1000-fix-infinite-loop.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=375
50 lines
1.8 KiB
Diff
50 lines
1.8 KiB
Diff
# Commit b7f74a19fe099e373ad52e4218c466f3e91b5f43
|
|
# Date 2015-01-23 15:05:48 +0100
|
|
# Author David Vrabel <david.vrabel@citrix.com>
|
|
# Committer Jan Beulich <jbeulich@suse.com>
|
|
grant-table: use uint16_t consistently for grant copy offset and length
|
|
|
|
Signed-off-by: David Vrabel <david.vrabel@citrix.com>
|
|
Acked-by: Jan Beulich <jbeulich@suse.com>
|
|
|
|
--- a/xen/common/grant_table.c
|
|
+++ b/xen/common/grant_table.c
|
|
@@ -1882,7 +1882,7 @@ static int
|
|
__acquire_grant_for_copy(
|
|
struct domain *rd, unsigned long gref, domid_t ldom, int readonly,
|
|
unsigned long *frame, struct page_info **page,
|
|
- unsigned *page_off, unsigned *length, unsigned allow_transitive)
|
|
+ uint16_t *page_off, uint16_t *length, unsigned allow_transitive)
|
|
{
|
|
struct grant_table *rgt = rd->grant_table;
|
|
grant_entry_v1_t *sha1;
|
|
@@ -1895,8 +1895,8 @@ __acquire_grant_for_copy(
|
|
grant_ref_t trans_gref;
|
|
struct domain *td;
|
|
unsigned long grant_frame;
|
|
- unsigned trans_page_off;
|
|
- unsigned trans_length;
|
|
+ uint16_t trans_page_off;
|
|
+ uint16_t trans_length;
|
|
int is_sub_page;
|
|
s16 rc = GNTST_okay;
|
|
|
|
@@ -2122,7 +2122,7 @@ __gnttab_copy(
|
|
|
|
if ( src_is_gref )
|
|
{
|
|
- unsigned source_off, source_len;
|
|
+ uint16_t source_off, source_len;
|
|
rc = __acquire_grant_for_copy(sd, op->source.u.ref,
|
|
current->domain->domain_id, 1,
|
|
&s_frame, &s_pg,
|
|
@@ -2147,7 +2147,7 @@ __gnttab_copy(
|
|
|
|
if ( dest_is_gref )
|
|
{
|
|
- unsigned dest_off, dest_len;
|
|
+ uint16_t dest_off, dest_len;
|
|
rc = __acquire_grant_for_copy(dd, op->dest.u.ref,
|
|
current->domain->domain_id, 0,
|
|
&d_frame, &d_pg, &dest_off, &dest_len, 1);
|