diff options
| author | Alan Cox <alan@linux.intel.com> | 2012-07-25 08:51:04 -0400 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-07-26 03:50:04 -0400 |
| commit | 0274df3e43be962eee0499ee97c514fdb1c8f3ae (patch) | |
| tree | 4f4591b7006ca6709cdc7272a2fd4e1b247ca70e | |
| parent | af447bd358acd92a8e96b61a3bf7a55c61a642f4 (diff) | |
i915: fix error path leak in intel_sdvo_write_cmd
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
| -rw-r--r-- | drivers/gpu/drm/i915/intel_sdvo.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c index 26a6a4d0d078..d172e9873131 100644 --- a/drivers/gpu/drm/i915/intel_sdvo.c +++ b/drivers/gpu/drm/i915/intel_sdvo.c | |||
| @@ -444,13 +444,16 @@ static bool intel_sdvo_write_cmd(struct intel_sdvo *intel_sdvo, u8 cmd, | |||
| 444 | struct i2c_msg *msgs; | 444 | struct i2c_msg *msgs; |
| 445 | int i, ret = true; | 445 | int i, ret = true; |
| 446 | 446 | ||
| 447 | /* Would be simpler to allocate both in one go ? */ | ||
| 447 | buf = (u8 *)kzalloc(args_len * 2 + 2, GFP_KERNEL); | 448 | buf = (u8 *)kzalloc(args_len * 2 + 2, GFP_KERNEL); |
| 448 | if (!buf) | 449 | if (!buf) |
| 449 | return false; | 450 | return false; |
| 450 | 451 | ||
| 451 | msgs = kcalloc(args_len + 3, sizeof(*msgs), GFP_KERNEL); | 452 | msgs = kcalloc(args_len + 3, sizeof(*msgs), GFP_KERNEL); |
| 452 | if (!msgs) | 453 | if (!msgs) { |
| 454 | kfree(buf); | ||
| 453 | return false; | 455 | return false; |
| 456 | } | ||
| 454 | 457 | ||
| 455 | intel_sdvo_debug_write(intel_sdvo, cmd, args, args_len); | 458 | intel_sdvo_debug_write(intel_sdvo, cmd, args, args_len); |
| 456 | 459 | ||
