Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752350AbcDRGeI (ORCPT ); Mon, 18 Apr 2016 02:34:08 -0400 Received: from smtp2.provo.novell.com ([137.65.250.81]:50414 "EHLO smtp2.provo.novell.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752232AbcDRGeG (ORCPT ); Mon, 18 Apr 2016 02:34:06 -0400 From: Davidlohr Bueso To: mingo@kernel.org, peterz@infradead.org Cc: waiman.long@hpe.com, dave@stgolabs.net, linux-kernel@vger.kernel.org, Davidlohr Bueso Subject: [PATCH -tip 3/3] locking/pvqspinlock: Robustify init_qspinlock_stat() Date: Sun, 17 Apr 2016 23:31:43 -0700 Message-Id: <1460961103-24953-3-git-send-email-dave@stgolabs.net> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1460961103-24953-1-git-send-email-dave@stgolabs.net> References: <1460961103-24953-1-git-send-email-dave@stgolabs.net> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1268 Lines: 39 Specifically around the debugfs file creation calls, I have no idea if they could ever possibly fail, but this is core code (debug aside) so lets at least check the return value and inform anything fishy. Signed-off-by: Davidlohr Bueso --- kernel/locking/qspinlock_stat.h | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/kernel/locking/qspinlock_stat.h b/kernel/locking/qspinlock_stat.h index 72722334237a..ddcd653c942c 100644 --- a/kernel/locking/qspinlock_stat.h +++ b/kernel/locking/qspinlock_stat.h @@ -225,12 +225,18 @@ static int __init init_qspinlock_stat(void) * performance. */ for (i = 0; i < qstat_num; i++) - debugfs_create_file(qstat_names[i], 0400, d_qstat, - (void *)(long)i, &fops_qstat); + if (!debugfs_create_file(qstat_names[i], 0400, d_qstat, + (void *)(long)i, &fops_qstat)) + goto fail; + + if (!debugfs_create_file(qstat_names[qstat_reset_cnts], 0200, d_qstat, + (void *)(long)qstat_reset_cnts, &fops_qstat)) + goto fail; - debugfs_create_file(qstat_names[qstat_reset_cnts], 0200, d_qstat, - (void *)(long)qstat_reset_cnts, &fops_qstat); return 0; +fail: + debugfs_remove_recursive(d_qstat); + return 1; } fs_initcall(init_qspinlock_stat); -- 2.8.1