Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp3855385pxj; Mon, 24 May 2021 17:00:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwtNOwqYWb3z4f3XiY653ff9/szjgZZx9XJHExCLpL+kIYcTmbuAdOn2FRauzdelgwBU9ZF X-Received: by 2002:a05:6638:2243:: with SMTP id m3mr25770994jas.88.1621900808136; Mon, 24 May 2021 17:00:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621900808; cv=none; d=google.com; s=arc-20160816; b=tz3FUFqMUMcu0cgADjaHhySfSpKtG8frv5oMtDWXf3jmLNhVchsCynpa2bpGVXxK8j Eh2FGbEWJzjsmNdV/iAqezr68Lf87fCVfDvGE681s4DuhdEsUpEBuFCDFE1/PJoy0Tq7 L7kvcpXpQD7WMdaPV8J3U/IoxQd5ONuU4V9wHxKp3/QORn/T+FZnyVunjqmy1oOvhkSJ bhj7E141ba4uKQBnYW1tdoG4nnjjuclaIqIv+phT8yKSlJn07bRNaqhKMS/i9RWa8Yxd MB8HAdeJscmlwoEtckZmt4SPrT3cb+E8+3Ram2qgiqlypuBapjv7t8dTzkLQJ3knPx0D cKUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=1uWZ+NAHubgjanKEPmNXVpKwJ6EadaqwsLZyvUrqkaY=; b=D09YLJGpfT32ZhtOkSRBSwsQ76JNIWK6ObDhfp7wm58Xa5Do4Zcl71e8O1bCGfnUZH BDPA+N6PAa3s8/vcQeu/AmzwIHJeACKIyrVu5jK9nvgXkZyEOVsqvlzLI/Lh7rzo5jqb OqLko6cXZcoeIplmUZZ6H2/RuL60/fJfPZ7Fjqv4+Pyq6HRpb1BFTihxaSGybLyGrP7F eIPoaBLHkfN64l2jh8SNMoKv6rIQYBRbXE4HN14aAGDYAAuPbK7pXshpTTQeM9SiGsbV sHgyJrF76o+FUocmIZkpFhsAgCICfVKF1zd6bioHL24gMmqJCZn4a6YbL9hOFzSlyYX6 tLCQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=goCM3ND7; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id j3si15686005jak.80.2021.05.24.16.59.55; Mon, 24 May 2021 17:00:08 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=goCM3ND7; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233373AbhEXVxl (ORCPT + 99 others); Mon, 24 May 2021 17:53:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48198 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232662AbhEXVxl (ORCPT ); Mon, 24 May 2021 17:53:41 -0400 Received: from mail-pj1-x1031.google.com (mail-pj1-x1031.google.com [IPv6:2607:f8b0:4864:20::1031]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3F92FC061574 for ; Mon, 24 May 2021 14:52:12 -0700 (PDT) Received: by mail-pj1-x1031.google.com with SMTP id pi6-20020a17090b1e46b029015cec51d7cdso11951127pjb.5 for ; Mon, 24 May 2021 14:52:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=1uWZ+NAHubgjanKEPmNXVpKwJ6EadaqwsLZyvUrqkaY=; b=goCM3ND7G1zeMucnRJt8nicQIOO+SOqc1h3FmK4+SIebD7dYEL3fL6HBrJrqQfGmWU si34CYLeIRc79Yf39VdhDjFJaDteeIQwMw0LGnJJ3sANRZ2PrUpNuLgOWy29HKPNfeVr M5efC8IWweo3GNUZw10VrALniXQ83Ck8IRKfyMY7Hi+q90cp4QRS+R8AnzGLFgqkTwRP LkH8V8klJsO1GtM0kozkENo8uaNeJepMvtB9xCNyztim18/PpS5Yh+ltke1WQAgqfYoE ZbrKxBpSIA/WShw3b+sBgMgEx15aYV9LmXzIv4dkuwgt1VgOfsCvZ27m4NHaHfN66kNl vguA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=1uWZ+NAHubgjanKEPmNXVpKwJ6EadaqwsLZyvUrqkaY=; b=rvAjwnqjpIMYPz1ST9ib8mVR5Jm8W0wL+LaiifNb2fqsKAhpkyXIUErQEajwsarIdt QnUnwTjmbPuIwxqW2Vv+PswdGBy3YJYU6zJMXiCEAsIiebSqkzoXmzDP2oz27CeiEJTf blxk/CB88r4U7ilM0zzsxqNX3fThzJE/+uJZl5JG3LSf2QSvTYk1WhSc8/4hAv2kl2AP cHr7asrg/i3Atu64uJO9vLehP6cdcXIVDP23046muLJHBCJdaOAhV0KS6nt6HK+V/RAh oBazAHxnqQtYl1P8eFYKmMsfy8f5ON91ljJtLgkshxQ0lCUhxPNZJF4slGYS819rF5Ha fWvQ== X-Gm-Message-State: AOAM532qNBPmRQKwxeqcePHp3TAuIdRWgHWFfTJTQOb/z2uhRj/cwMd6 NjOjVnhzcUdh2VXzX4XWEiOA1+mbADXQSm8I X-Received: by 2002:a17:90a:bd08:: with SMTP id y8mr1323187pjr.8.1621893131421; Mon, 24 May 2021 14:52:11 -0700 (PDT) Received: from nhaiderx-mobl1.gar.corp.intel.com ([2409:4063:2309:9691:60bf:7a61:5dc3:9ca1]) by smtp.gmail.com with ESMTPSA id n28sm5447800pfq.139.2021.05.24.14.52.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 May 2021 14:52:11 -0700 (PDT) From: nizamhaider786@gmail.com To: lkundrak@v3.sk Cc: arnd@arndb.de, gregkh@linuxfoundation.org, linux-kernel@vger.kernel.org, Nijam Haider Subject: [PATCH v3 1/2] char: pcmcia: scr24x_cs: Fix failure handling of device_create() Date: Tue, 25 May 2021 03:22:01 +0530 Message-Id: <20210524215202.495-1-nizamhaider786@gmail.com> X-Mailer: git-send-email 2.31.1.windows.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Nijam Haider Ignored error in device_create() and pcmcia_enable_device() this patch implements proper error handling. Signed-off-by: Nijam Haider --- V2 -> V3: Added description, Changelog and removed whitespace error V1 -> V2: Split the patch into two parts and addressed review comments --- drivers/char/pcmcia/scr24x_cs.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/drivers/char/pcmcia/scr24x_cs.c b/drivers/char/pcmcia/scr24x_cs.c index 47feb39af34c..b48e79356611 100644 --- a/drivers/char/pcmcia/scr24x_cs.c +++ b/drivers/char/pcmcia/scr24x_cs.c @@ -233,6 +233,7 @@ static int scr24x_probe(struct pcmcia_device *link) { struct scr24x_dev *dev; int ret; + struct device *dev_ret; dev = kzalloc(sizeof(*dev), GFP_KERNEL); if (!dev) @@ -272,12 +273,20 @@ static int scr24x_probe(struct pcmcia_device *link) ret = pcmcia_enable_device(link); if (ret < 0) { + cdev_del(&dev->c_dev); pcmcia_disable_device(link); goto err; } - device_create(scr24x_class, NULL, MKDEV(MAJOR(scr24x_devt), dev->devno), + dev_ret = device_create(scr24x_class, NULL, MKDEV(MAJOR(scr24x_devt), dev->devno), NULL, "scr24x%d", dev->devno); + if (IS_ERR(dev_ret)) { + dev_err(&link->dev, "device_create failed for %d\n", + dev->devno); + cdev_del(&dev->c_dev); + pcmcia_disable_device(link); + goto err; + } dev_info(&link->dev, "SCR24x Chip Card Interface\n"); return 0; -- 2.7.4