Received: by 2002:a25:8b91:0:0:0:0:0 with SMTP id j17csp3459310ybl; Sun, 15 Dec 2019 10:13:48 -0800 (PST) X-Google-Smtp-Source: APXvYqwoa3Y2jjcuqtgp/lwafSH1uJdUw1tOGILmW8xbv+zYjK1sWwi2bTIssTkO9Yioo+XVBlyz X-Received: by 2002:a05:6830:1d6a:: with SMTP id l10mr28410721oti.233.1576433628230; Sun, 15 Dec 2019 10:13:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1576433628; cv=none; d=google.com; s=arc-20160816; b=en/IgBV2hzqd4kGm08ecElllHBHzdgGk+q0Fq+26r1QwfU+2jfEY4iT6eWfvs1JXjF eZpnXjt0RrN3O1qW4fkeYIpCrOgGIY11JP6yuGpJ4w6TJ1EVPtDteh2ybkc7CElRywcX uHxwqaWcwmPMvOwRONaICLv3aFycm9sVmR36douhu6atrkShTOcjbuY5xYzljzNDZ2t9 JvK52d4oIcKKYuYTWoavsCMguLbQuz/M04GDLotlhoSAq3tWnY+wKRAZNeHqMUg6Z+FC 6UDRUda17oeWRAzq9SWfznLeOa1IDOEQeZkGJ/J1n8pvSxJlJ3QZ+/iaOlooUet+CAk9 gQvA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=s1Sd4wDOGySgNuBq62kvgRKaS2P+yDRGvZWncnO1u3k=; b=awqxLD6SFdX2m5GmA+pn9Zc2RCyIQNsLPA9KTWCE7fQItUia4i1GLMnUN4bScqJzIh uMFFjg1ekOteO5Y03cRwObXQTmFrf9nqUQmCUDmld1xBnJ5QNJ/7ICpwm69UIMBb1ER9 q2R1dqz1142QpPuRHtvsghCMLxVyq7Qciwtv/jhNxAvp5y9SWHgX9n+QaidzArQzFl5s TtmWhaWxSf9KOiyy5EL7goDr6dqFqrunsfthwnFL8B+l6huyPxBVzDjBWzHmpuk/LJif mGNEEeJguMqOnP74rx8VDdY/T7/05ER1T6Bnh9TRbTJVFUA7H+wrEZ9tLT+h3THnND5g lehg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@umn.edu header.s=google header.b=T9aEdQlg; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=umn.edu Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id t134si8612381oie.148.2019.12.15.10.13.36; Sun, 15 Dec 2019 10:13:48 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@umn.edu header.s=google header.b=T9aEdQlg; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=umn.edu Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726295AbfLOSMx (ORCPT + 99 others); Sun, 15 Dec 2019 13:12:53 -0500 Received: from mta-p7.oit.umn.edu ([134.84.196.207]:56146 "EHLO mta-p7.oit.umn.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726148AbfLOSMw (ORCPT ); Sun, 15 Dec 2019 13:12:52 -0500 Received: from localhost (unknown [127.0.0.1]) by mta-p7.oit.umn.edu (Postfix) with ESMTP id 47bXZD1GySz9vYkk for ; Sun, 15 Dec 2019 18:12:52 +0000 (UTC) X-Virus-Scanned: amavisd-new at umn.edu Received: from mta-p7.oit.umn.edu ([127.0.0.1]) by localhost (mta-p7.oit.umn.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id McuPVEJyQibx for ; Sun, 15 Dec 2019 12:12:52 -0600 (CST) Received: from mail-yw1-f69.google.com (mail-yw1-f69.google.com [209.85.161.69]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mta-p7.oit.umn.edu (Postfix) with ESMTPS id 47bXZD06SKz9vYkp for ; Sun, 15 Dec 2019 12:12:52 -0600 (CST) Received: by mail-yw1-f69.google.com with SMTP id 16so4013567ywz.5 for ; Sun, 15 Dec 2019 10:12:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=umn.edu; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=s1Sd4wDOGySgNuBq62kvgRKaS2P+yDRGvZWncnO1u3k=; b=T9aEdQlgrUMr5PCmALh0xtrBogCzg6SwS+LSaCSNmY8AlNcgSeTaopntfe/joFepcP apFVkpz0ZNerL8JIjA7AfaAeuyud5z4lZj827ATCowSOXbA9dXiQW0UUD+L0w1rJ0/y5 LB2wvkflqacATyhGAauiN1U0WMN87XKsd3H4PmoZ0GXNtg7u0jnjTrgOWIMlnWh5/611 uIju8sfKfv4fhkKbREabtNRv7619hxv6gnu5gKTg28n9vzx/gK0FuLiPpdj38ITIKyXK sfyyMshdltskk4aehjxoOhnT6+vkmTiqMH7Z/QInbzAlRL0U6SHRx5rMtwiFavgXWCwq nhiA== 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=s1Sd4wDOGySgNuBq62kvgRKaS2P+yDRGvZWncnO1u3k=; b=ELYvcwlo2zW7ehpFKmGVTa1rVKodx41c2y7zPu2LP8vZ6hyETrADLGYT2r8DFYq+j9 2/XRPp4CSHPXAU/ty1Raq103gbYwjwKb+BvKLwfJCmtf6LgS3+taDhnpR5GCvKRDmZ2A i0nZupuPXBzNk7yM8IpkyKwMaCwmdKm+LK246Vk/hWTFr+JsDBJQyKqLESuPu6A4CAOj yDc8lYa5paYDxjoQVNt2Sa0uWnr57ZDvKUNFHHdbIFcDsF5bebDAmVltwQ3DbK9NCmNf 7Ke1ztlfUeBN0lI1/LqwBQdAQPEWq7CN1DNOKHkzv0WMKtUrVVEnU+r2Wzq7R/SI1p0v CeBA== X-Gm-Message-State: APjAAAUz4q12f8Edd73uGKIg/F1Ud3K8G3PAXiR8G4i50pcvGuh8SzOh Y5sonCz1UqPHj1bBfJpBNNucYEFwZdAAYi3zyTMploaHYpzL0LyGDdpqyJkdplHK7M2nY2LA5H5 tpxdZ/BMElx+xaxmcUq4VWNUihwLr X-Received: by 2002:a25:31c6:: with SMTP id x189mr17347169ybx.514.1576433571479; Sun, 15 Dec 2019 10:12:51 -0800 (PST) X-Received: by 2002:a25:31c6:: with SMTP id x189mr17347150ybx.514.1576433571249; Sun, 15 Dec 2019 10:12:51 -0800 (PST) Received: from cs-u-syssec1.dtc.umn.edu (cs-u-syssec1.cs.umn.edu. [128.101.106.66]) by smtp.gmail.com with ESMTPSA id u130sm2260529ywc.10.2019.12.15.10.12.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Dec 2019 10:12:50 -0800 (PST) From: Aditya Pakki To: pakki001@umn.edu Cc: kjlu@umn.edu, Greg Kroah-Hartman , Vandana BN , =?UTF-8?q?Simon=20Sandstr=C3=B6m?= , Jeremy Sowden , Harsh Jain , Matt Sickler , devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org Subject: [PATCH] staging: kpc2000: replace assertion with recovery code Date: Sun, 15 Dec 2019 12:12:37 -0600 Message-Id: <20191215181243.31519-1-pakki001@umn.edu> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In kpc_dma_transfer, if either priv or ldev is NULL, crashing the process is excessive and is not needed. Instead of asserting, by passing the error upstream, the error can be handled. Signed-off-by: Aditya Pakki --- drivers/staging/kpc2000/kpc_dma/fileops.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/staging/kpc2000/kpc_dma/fileops.c b/drivers/staging/kpc2000/kpc_dma/fileops.c index cb52bd9a6d2f..1c4633267cc1 100644 --- a/drivers/staging/kpc2000/kpc_dma/fileops.c +++ b/drivers/staging/kpc2000/kpc_dma/fileops.c @@ -49,9 +49,11 @@ static int kpc_dma_transfer(struct dev_private_data *priv, u64 dma_addr; u64 user_ctl; - BUG_ON(priv == NULL); + if (!priv) + return -EINVAL; ldev = priv->ldev; - BUG_ON(ldev == NULL); + if (!ldev) + return -EINVAL; acd = kzalloc(sizeof(*acd), GFP_KERNEL); if (!acd) { -- 2.20.1