From: Matthew Auld <matthew.auld@intel.com>
To: intel-gfx@lists.freedesktop.org
Cc: Dan Carpenter <dan.carpenter@oracle.com>,
kernel test robot <lkp@intel.com>,
dri-devel@lists.freedesktop.org
Subject: [PATCH 2/2] drm/i915/selftests: fix smatch warning in mock_reserve
Date: Fri, 2 Jul 2021 11:46:42 +0100 [thread overview]
Message-ID: <20210702104642.1189978-2-matthew.auld@intel.com> (raw)
In-Reply-To: <20210702104642.1189978-1-matthew.auld@intel.com>
If mock_region_create fails then mem will be an error pointer. Instead
we just need to use the correct ordering for the onion unwind.
igt_mock_reserve() error: 'mem' dereferencing possible ERR_PTR()
Reported-by: kernel test robot <lkp@intel.com>
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Matthew Auld <matthew.auld@intel.com>
---
drivers/gpu/drm/i915/selftests/intel_memory_region.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/i915/selftests/intel_memory_region.c b/drivers/gpu/drm/i915/selftests/intel_memory_region.c
index 1aaccb9841a0..418caae84759 100644
--- a/drivers/gpu/drm/i915/selftests/intel_memory_region.c
+++ b/drivers/gpu/drm/i915/selftests/intel_memory_region.c
@@ -173,7 +173,7 @@ static int igt_mock_reserve(void *arg)
if (IS_ERR(mem)) {
pr_err("failed to create memory region\n");
err = PTR_ERR(mem);
- goto out_close;
+ goto out_free_order;
}
/* Reserve a bunch of ranges within the region */
@@ -224,9 +224,10 @@ static int igt_mock_reserve(void *arg)
}
out_close:
- kfree(order);
close_objects(mem, &objects);
intel_memory_region_put(mem);
+out_free_order:
+ kfree(order);
return err;
}
--
2.26.3
next prev parent reply other threads:[~2021-07-02 10:46 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-02 10:46 [PATCH 1/2] drm/i915/selftests: fix smatch warning in igt_check_blocks Matthew Auld
2021-07-02 10:46 ` Matthew Auld [this message]
2021-07-06 9:43 ` [PATCH 2/2] drm/i915/selftests: fix smatch warning in mock_reserve Ramalingam C
2021-07-06 9:39 ` [PATCH 1/2] drm/i915/selftests: fix smatch warning in igt_check_blocks Ramalingam C
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210702104642.1189978-2-matthew.auld@intel.com \
--to=matthew.auld@intel.com \
--cc=dan.carpenter@oracle.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=lkp@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox