From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1168691AbcKAKp0 (ORCPT ); Tue, 1 Nov 2016 06:45:26 -0400 Received: from mail-lf0-f67.google.com ([209.85.215.67]:34784 "EHLO mail-lf0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1168544AbcKAKpZ (ORCPT ); Tue, 1 Nov 2016 06:45:25 -0400 From: Johan Hovold To: Alexander Shishkin Cc: linux-kernel@vger.kernel.org, Johan Hovold Subject: [PATCH] stm class: fix device leak in open error path Date: Tue, 1 Nov 2016 11:44:54 +0100 Message-Id: <1477997094-29192-1-git-send-email-johan@kernel.org> X-Mailer: git-send-email 2.7.3 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Make sure to drop the reference taken by class_find_device() also on allocation errors in open(). Fixes: 7bd1d4093c2f ("stm class: Introduce an abstraction for...") Signed-off-by: Johan Hovold --- drivers/hwtracing/stm/core.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/hwtracing/stm/core.c b/drivers/hwtracing/stm/core.c index 51f81d64ca37..47811f5c9bc9 100644 --- a/drivers/hwtracing/stm/core.c +++ b/drivers/hwtracing/stm/core.c @@ -368,8 +368,10 @@ static int stm_char_open(struct inode *inode, struct file *file) return -ENODEV; stmf = kzalloc(sizeof(*stmf), GFP_KERNEL); - if (!stmf) - return -ENOMEM; + if (!stmf) { + err = -ENOMEM; + goto err_put_device; + } stm_output_init(&stmf->output); stmf->stm = to_stm_device(dev); @@ -382,9 +384,10 @@ static int stm_char_open(struct inode *inode, struct file *file) return nonseekable_open(inode, file); err_free: + kfree(stmf); +err_put_device: /* matches class_find_device() above */ put_device(dev); - kfree(stmf); return err; } -- 2.7.3