Merge tag 'v4.1.39' into 4.1-2.0.x-imx

Linux 4.1.39

* tag 'v4.1.39': (138 commits)
  Linux 4.1.39
  KVM: x86: remove data variable from kvm_get_msr_common
  KVM: VMX: Fix host initiated access to guest MSR_TSC_AUX
  KVM: x86: pass host_initiated to functions that read MSRs
  perf/core: Fix the perf_cpu_time_max_percent check
  perf/core: Make sysctl_perf_cpu_time_max_percent conform to documentation
  perf/core: Fix implicitly enable dynamic interrupt throttle
  perf/core: Fix dynamic interrupt throttle
  Fix missing sanity check in /dev/sg
  printk: use rcuidle console tracepoint
  vfs: fix uninitialized flags in splice_to_pipe()
  drm/radeon: Use mode h/vdisplay fields to hide out of bounds HW cursor
  ARM: 8658/1: uaccess: fix zeroing of 64-bit get_user()
  drm/dp/mst: fix kernel oops when turning off secondary monitor
  [media] siano: make it work again with CONFIG_VMAP_STACK
  mmc: core: fix multi-bit bus width without high-speed mode
  futex: Move futex_init() to core_initcall
  xen-netfront: Delete rx_refill_timer in xennet_disconnect_backend()
  scsi: aacraid: Fix INTx/MSI-x issue with older controllers
  cpumask: use nr_cpumask_bits for parsing functions
  ...

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>

1 files changed, 14 insertions, 12 deletions

diff --git a/drivers/video/fbdev/core/fbcmap.c b/drivers/video/fbdev/core/fbcmap.c
index f89245b8ba8e..68a113594808 100644
--- a/drivers/video/fbdev/core/fbcmap.c
+++ b/drivers/video/fbdev/core/fbcmap.c
@@ -163,17 +163,18 @@ void fb_dealloc_cmap(struct fb_cmap *cmap)
 
 int fb_copy_cmap(const struct fb_cmap *from, struct fb_cmap *to)
 {
-	int tooff = 0, fromoff = 0;
-	int size;
+	unsigned int tooff = 0, fromoff = 0;
+	size_t size;
 
 	if (to->start > from->start)
 		fromoff = to->start - from->start;
 	else
 		tooff = from->start - to->start;
-	size = to->len - tooff;
-	if (size > (int) (from->len - fromoff))
-		size = from->len - fromoff;
-	if (size <= 0)
+	if (fromoff >= from->len || tooff >= to->len)
+		return -EINVAL;
+
+	size = min_t(size_t, to->len - tooff, from->len - fromoff);
+	if (size == 0)
 		return -EINVAL;
 	size *= sizeof(u16);
 
@@ -187,17 +188,18 @@ int fb_copy_cmap(const struct fb_cmap *from, struct fb_cmap *to)
 
 int fb_cmap_to_user(const struct fb_cmap *from, struct fb_cmap_user *to)
 {
-	int tooff = 0, fromoff = 0;
-	int size;
+	unsigned int tooff = 0, fromoff = 0;
+	size_t size;
 
 	if (to->start > from->start)
 		fromoff = to->start - from->start;
 	else
 		tooff = from->start - to->start;
-	size = to->len - tooff;
-	if (size > (int) (from->len - fromoff))
-		size = from->len - fromoff;
-	if (size <= 0)
+	if (fromoff >= from->len || tooff >= to->len)
+		return -EINVAL;
+
+	size = min_t(size_t, to->len - tooff, from->len - fromoff);
+	if (size == 0)
 		return -EINVAL;
 	size *= sizeof(u16);