From patchwork Fri Jun 14 15:16:37 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Rissi X-Patchwork-Id: 2722041 X-Patchwork-Delegate: jikos@jikos.cz Return-Path: X-Original-To: patchwork-linux-input@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 5969A9F8E4 for ; Fri, 14 Jun 2013 15:16:55 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 48ED020306 for ; Fri, 14 Jun 2013 15:16:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id ED81220305 for ; Fri, 14 Jun 2013 15:16:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753137Ab3FNPQv (ORCPT ); Fri, 14 Jun 2013 11:16:51 -0400 Received: from mail-wi0-f172.google.com ([209.85.212.172]:46420 "EHLO mail-wi0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753081Ab3FNPQv (ORCPT ); Fri, 14 Jun 2013 11:16:51 -0400 Received: by mail-wi0-f172.google.com with SMTP id c10so450130wiw.17 for ; Fri, 14 Jun 2013 08:16:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer; bh=w8NqYtcDrPYGUouMDWraw6mM9K+XbYkit3TXvEidayQ=; b=OfQWZkTOqLl3elud1bOhj02vrrRa+nTJXkEYNCC/gUBqfkFZKE+2gl3AHVU9xod2Rn 4R+/Hdsgl0W5knkRv5dcHCPU3DlGTQvPkLZeH08g9yTAt8fr52j9xNeIb1dwTYP08FaZ GIGnEOdA+5RFI5z55NiX38eVY6qQa6q439+o3XuQ++y2yjT8sMsPF5HjMuqY5/zkPH3C 1IrAeCtx5a+0saOzEBOH9mrbPaiJuD6CCpyaJmJKkk+wnlhKr/LMklpSKKdgBbFcqY+Y wRqPbnPCer/Zn2wDlSAjjEqrJ17s2xXOzUnTI25veaGS+WkTTmJAk+2qnXx6gQSQVaof vnHQ== X-Received: by 10.180.38.37 with SMTP id d5mr1606220wik.37.1371223009614; Fri, 14 Jun 2013 08:16:49 -0700 (PDT) Received: from localhost.localdomain (a2176-0490160833.pck.nerim.net. [213.41.134.21]) by mx.google.com with ESMTPSA id fu14sm3856037wic.8.2013.06.14.08.16.47 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 14 Jun 2013 08:16:48 -0700 (PDT) From: Michael Rissi To: jkosina@suse.cz, linux-input@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Michael Rissi Subject: [PATCH] HID: roccat: check cdev_add return values Date: Fri, 14 Jun 2013 17:16:37 +0200 Message-Id: <1371222997-4933-1-git-send-email-michael.rissi@dectris.com> X-Mailer: git-send-email 1.7.9.5 Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Return value of cdev_add in hid_roccat.c init was not checked. Signed-off-by: Michael Rissi --- drivers/hid/hid-roccat.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/drivers/hid/hid-roccat.c b/drivers/hid/hid-roccat.c index b59b3df..65c4ccfc 100644 --- a/drivers/hid/hid-roccat.c +++ b/drivers/hid/hid-roccat.c @@ -366,7 +366,7 @@ void roccat_disconnect(int minor) mutex_lock(&devices_lock); devices[minor] = NULL; mutex_unlock(&devices_lock); - + if (device->open) { hid_hw_close(device->hid); wake_up_interruptible(&device->wait); @@ -426,13 +426,23 @@ static int __init roccat_init(void) if (retval < 0) { pr_warn("can't get major number\n"); - return retval; + goto error; } cdev_init(&roccat_cdev, &roccat_ops); - cdev_add(&roccat_cdev, dev_id, ROCCAT_MAX_DEVICES); + retval = cdev_add(&roccat_cdev, dev_id, ROCCAT_MAX_DEVICES); + if (retval < 0) { + pr_warn("cannot add cdev\n"); + goto cleanup_alloc_chrdev_region; + } return 0; + + + cleanup_alloc_chrdev_region: + unregister_chrdev_region(dev_id, ROCCAT_MAX_DEVICES); + error: + return retval; } static void __exit roccat_exit(void)