If the allocation of 'buf' succeeds but the allocation of 'msgs' fails
we'll return false and leak 'buf' when it goes out of scope.
Signed-off-by: Jesper Juhl <jj@xxxxxxxxxxxxx>
---
drivers/gpu/drm/i915/intel_sdvo.c | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
note: compile tested only due to lack of hardware.
diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c
index 26a6a4d..1f73e24 100644
--- a/drivers/gpu/drm/i915/intel_sdvo.c
+++ b/drivers/gpu/drm/i915/intel_sdvo.c
@@ -444,13 +444,12 @@ static bool intel_sdvo_write_cmd(struct intel_sdvo *intel_sdvo, u8 cmd,
struct i2c_msg *msgs;
int i, ret = true;
- buf = (u8 *)kzalloc(args_len * 2 + 2, GFP_KERNEL);
- if (!buf)
- return false;
-
+ buf = kzalloc(args_len * 2 + 2, GFP_KERNEL);
msgs = kcalloc(args_len + 3, sizeof(*msgs), GFP_KERNEL);
- if (!msgs)
- return false;
+ if (!msgs || !buf) {
+ ret = false;
+ goto out;
+ }
intel_sdvo_debug_write(intel_sdvo, cmd, args, args_len);
--
1.7.11.3
--
Jesper Juhl <jj@xxxxxxxxxxxxx> http://www.chaosbits.net/
Don't top-post http://www.catb.org/jargon/html/T/top-post.html
Plain text mails only, please.
_______________________________________________
dri-devel mailing list
dri-devel@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/dri-devel
