From: Martina Kollarova <martina.kollarova@intel.com>
Date: Thu, 8 Sep 2016 12:12:42 +0000 (+0300)
Subject: gallium: fix return value check
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=2527e18eebe2faf395d1682db7df76043aca6ea3;p=mesa.git

gallium: fix return value check

A possible error (-1) was being lost because it was first converted to an
unsigned int and only then checked.

Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
Signed-off-by: Martina Kollarova <martina.kollarova@intel.com>
Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>
---

diff --git a/src/gallium/winsys/sw/kms-dri/kms_dri_sw_winsys.c b/src/gallium/winsys/sw/kms-dri/kms_dri_sw_winsys.c
index 07eca990d04..22e1c936ac5 100644
--- a/src/gallium/winsys/sw/kms-dri/kms_dri_sw_winsys.c
+++ b/src/gallium/winsys/sw/kms-dri/kms_dri_sw_winsys.c
@@ -252,18 +252,18 @@ kms_sw_displaytarget_add_from_prime(struct kms_sw_winsys *kms_sw, int fd,
    if (!kms_sw_dt)
       return NULL;
 
+   off_t lseek_ret = lseek(fd, 0, SEEK_END);
+   if (lseek_ret == -1) {
+      FREE(kms_sw_dt);
+      return NULL;
+   }
+   kms_sw_dt->size = lseek_ret;
    kms_sw_dt->ref_count = 1;
    kms_sw_dt->handle = handle;
-   kms_sw_dt->size = lseek(fd, 0, SEEK_END);
    kms_sw_dt->width = width;
    kms_sw_dt->height = height;
    kms_sw_dt->stride = stride;
 
-   if (kms_sw_dt->size == (off_t)-1) {
-      FREE(kms_sw_dt);
-      return NULL;
-   }
-
    lseek(fd, 0, SEEK_SET);
 
    list_add(&kms_sw_dt->link, &kms_sw->bo_list);