Received: by 2002:a05:6a10:d5a5:0:0:0:0 with SMTP id gn37csp4093101pxb; Mon, 4 Oct 2021 17:21:11 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzB6fWqdev1RW+dp+hstbvosku36B8XPgz6fZ01F9ndKzQnd9S9saGJJQZbD0HH8Ua78V75 X-Received: by 2002:a17:906:308d:: with SMTP id 13mr20494030ejv.570.1633393271155; Mon, 04 Oct 2021 17:21:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1633393271; cv=none; d=google.com; s=arc-20160816; b=R/q27Q//xJrf9MKJFUI+1JsY0FAAFKkqxAAo3hjyakKa7lbPnjxhdeqXC/aU+urwYW T+O8ryUVulCNuMkEPGFGOpCatXiFE3qednUWmkL/lirUfBYC7v8S+cTEBXRDD9SY33bA Ejok9Ghd8jhoLMcTiWfqH5MYwCJy8s5naqYXElomb8SLh0OY9VJtUckhWRCFbQk3XMr3 ZLIsb1P9HOjWq2B+u3pJJE2HtkbA7Gk7RmISec+cOXj2C/RdS/5aDiZh1lz+j/LAnWGx FV+mTbsxMvtrWpU7KTWD45S73VhHpSgchzIf4cSVmCypIx0jCPQxIolpq+mmCosn5/v4 I6iA== 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=66dX0OvQYrrj3UairmmHI6a5MNBzAVnr6VxC1SQ5QfI=; b=JClrTEZtZVozK8D/SepNpqNFcbKYDR66CsVKWYpnYP89k96fm4yfPzEa5dc3nAKYcq 6pD90/sigrrWbjQ9lQ8oWTk1SxLLmxSbfJBDLT12nYkYR0ZV6520x4kfUf4Y2jq7R2I4 Xjkbdo874EEaAocikB+1IHzO59Wu2uOAw0a5wvbVnWVqptPMveA1S4M2ZP2qbEN6aBsR kfL0ldRyNJr0asLeViMX5w1mY9p3T8OizFnHN+/4DYLdBjltqRsL827qZwmmzH50BR5h T3Fla6ZNAx50UMPbwgaqM91KC7uSGPQCKQ2fjx8RXLjOeaeflSrs+tBWrbhesmTQNl2l cwGw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=google header.b=hvEooSDK; 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=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id s3si18713270ejs.386.2021.10.04.17.20.47; Mon, 04 Oct 2021 17:21:11 -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=@linuxfoundation.org header.s=google header.b=hvEooSDK; 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=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235675AbhJDUIe (ORCPT + 99 others); Mon, 4 Oct 2021 16:08:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45726 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229945AbhJDUId (ORCPT ); Mon, 4 Oct 2021 16:08:33 -0400 Received: from mail-oo1-xc2a.google.com (mail-oo1-xc2a.google.com [IPv6:2607:f8b0:4864:20::c2a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8BEC0C061745 for ; Mon, 4 Oct 2021 13:06:44 -0700 (PDT) Received: by mail-oo1-xc2a.google.com with SMTP id t17-20020a4ac891000000b002b612d6d5e9so5050219ooq.10 for ; Mon, 04 Oct 2021 13:06:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=66dX0OvQYrrj3UairmmHI6a5MNBzAVnr6VxC1SQ5QfI=; b=hvEooSDKadJeMyTNjVqfQodNlOhWjjHiswUVR7NbCKMyO19iSeUcZbOHrUjmjbK3oO 1ta52VaFo6NnyhIASZDZhNfGySCPzL0Z2TroxcJUGKcl6tYDFENjGp+7scdQ8w0fFm45 Db+FFa9sDxTUCKuZi8fy0A2eGPOz9a8RrepwQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=66dX0OvQYrrj3UairmmHI6a5MNBzAVnr6VxC1SQ5QfI=; b=hnO3ypaRCwfAMwZjwxrBD0VWCxF2YMWhtPf+EL/V1GaGUDp06dIaVcYmSz9LFzDu7s 8XsIChPafCbYHuddBU7/GCsmhaRcDP0U+BTDSJ1JgTXwn8kWz3ZF15j62x6SzaT8H3fD 0FDZGImNC2SStXcDQbHLRsJ1lqtfujHESasaJPBodRm26GQZuskBaAh77fDIf/8wHP/x 2o2DhRKMIV4EDbQODJTJ0TCB6wQRu5L19R4XgQaTFPZarLiCETnnhjCl/G9lkwToJ4ap AD+Z2q8EVTYB/rKLa7h1FopUcXldXvjkEA28CdBpsaCJdTjZGfTj1N4HPhrelFyX9/7J fxuw== X-Gm-Message-State: AOAM5302D3KDgdpsCiUwcIChH3QNNev9X0XT8rw5mWj40lDjfVZwLWcr rPQPfJp0VzecwOIpU5gpQMp/zQ== X-Received: by 2002:a4a:7059:: with SMTP id b25mr10598983oof.54.1633378003899; Mon, 04 Oct 2021 13:06:43 -0700 (PDT) Received: from shuah-t480s.internal (c-24-9-64-241.hsd1.co.comcast.net. [24.9.64.241]) by smtp.gmail.com with ESMTPSA id e12sm3123842otq.4.2021.10.04.13.06.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Oct 2021 13:06:43 -0700 (PDT) From: Shuah Khan To: agk@redhat.com, snitzer@redhat.com Cc: Shuah Khan , dm-devel@redhat.com, linux-kernel@vger.kernel.org Subject: [PATCH] dm: change dm_get_target_type() to check for module load error Date: Mon, 4 Oct 2021 14:06:41 -0600 Message-Id: <20211004200641.378496-1-skhan@linuxfoundation.org> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org dm_get_target_type() doesn't check error return from request_module(). Change to check for error and return NULL instead of trying to get target type again which would fail. Signed-off-by: Shuah Khan --- drivers/md/dm-target.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/drivers/md/dm-target.c b/drivers/md/dm-target.c index 64dd0b34fcf4..0789e9f91d3a 100644 --- a/drivers/md/dm-target.c +++ b/drivers/md/dm-target.c @@ -41,17 +41,22 @@ static struct target_type *get_target_type(const char *name) return tt; } -static void load_module(const char *name) +static int load_module(const char *name) { - request_module("dm-%s", name); + return request_module("dm-%s", name); } struct target_type *dm_get_target_type(const char *name) { struct target_type *tt = get_target_type(name); + int ret; if (!tt) { - load_module(name); + ret = load_module(name); + if (ret < 0) { + pr_err("Module %s load failed %d\n", name, ret); + return NULL; + } tt = get_target_type(name); } -- 2.30.2