From nobody Thu Dec 18 03:20:21 2025 Received: from mail-ed1-f44.google.com (mail-ed1-f44.google.com [209.85.208.44]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B8D0E22F38E for ; Wed, 15 Jan 2025 06:53:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736924040; cv=none; b=gi1epwOWKuW3aS6wu4yzxCrwH7z1wwnMpAfjBp5fKyW0lLLljyX4YPhcm/6WPyC7y9GEXE1NtzzRHHS+WitPRMNSvITTCh2H5+lvM8ISgnv2EzYDNIwVT9jCuniUeyIvJCI70mdWpugHtgy3n7AlUIq3r3Fer22ZfTCotFwMzoQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736924040; c=relaxed/simple; bh=KFp3jdXWgMaBUXdQHCLFP0wUMgB2SIATpb93CgoUtDY=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type: Content-Disposition; b=hU2Cb+30AwioSIG6t8l5r8mtTtQCtyDECcgSmNdjaSC0FL5YdUC8SJd4Ky1ySBbfAN9F7W7HJzeetsGi43dEy/wk9emhg1bqNfAVk+OlpI/GeikuRGN+Ay92X8/cyHRdu47z29n15WMZUzo3mBJ8vdVa7FTPfl5Gd8CfZj+M1Rg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=mZxGvw48; arc=none smtp.client-ip=209.85.208.44 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="mZxGvw48" Received: by mail-ed1-f44.google.com with SMTP id 4fb4d7f45d1cf-5d9f0a6ad83so4375924a12.2 for ; Tue, 14 Jan 2025 22:53:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1736924036; x=1737528836; darn=vger.kernel.org; h=content-disposition:mime-version:message-id:subject:cc:to:from:date :from:to:cc:subject:date:message-id:reply-to; bh=eKPKC6VCuB1agu4M92Pt0Cj7EiQedFYv4oj19q1B6lE=; b=mZxGvw48X2M5Z3PBIxQtbFz741kjqRkxPiGypncHr/Q6S87yciiMbYw/YUis1rBrAq +h0WhcAlmwFyTxBtuv+WfdFk2W/+sdE2JcF649DWYq+3XDcDoh3959Etw68bgbTEX6fN hDCssWTqJrpFovWkzrqM585lhFb35zbfNene6cOwHcdJ/xTL3rqTYAgI8sC7U1I7xl68 4blHojoLRQ8DfhYBGXLMIZc/poe0CUdYXT6XCehOmFXB+Q0I88X4a05fEhAL+2f/kiwA 64sB3lOtWQKQ4Rf3NThNTZRzOn4gEBJOaomR/R7ouHJPspjhcobUJQm7ttm+KVAsdeb8 LcSw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736924036; x=1737528836; h=content-disposition:mime-version:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=eKPKC6VCuB1agu4M92Pt0Cj7EiQedFYv4oj19q1B6lE=; b=wRP+kiPFl/fPFU3GE3gt6aZ3bUFNZxiq9WNIJZLPZFOm+XtiFEr6vGS/73fysUiR8X K64+X1JBTt3OZ/uue9VNmbx+ONHGP4m5RCq4x/hB4NiSLCo8eXf7nbVRfguuXDTK5rsd YMGDLcqkNPMkgR2Y+0lr2Sc8sTcGn2T2bijuvn5cGeYrwb8a4a+ypoWTtUvtOs9msbT3 nilUodYtKUVSGv7YgoHwECrCw9V/nwgGsRsNsCq15ag25/y6plZRX1J16dJz9E7HGNy1 LIhVFPnI/94kDX3VrFV3UKsvrNqUCrQ4xDeR4/yaFQ/zU6bwz0pwAyslhPZK0AeNJFzQ w5XA== X-Forwarded-Encrypted: i=1; AJvYcCUu+zdYDQ0s34HpRnkJy6E6Zh9iQvqKE9ewNT/rbRtiMpE3eGWUW2oBsSd4OE53idsQ08aUIlpASZauegw=@vger.kernel.org X-Gm-Message-State: AOJu0YwKISdzpAnFqR/izOD8fESqbm/YWXZWg4kGDD8VfAt+5uAg2bSI D1WXFMg6fAVyZzidRoeq1XcH1c4tgws1D5Hd8sL0ugPd0X/HiZlsVa3693bLINM= X-Gm-Gg: ASbGncshAGq8A/9s/ZaRCT2NhlVKpLU5bAOpsfp2NghVsiPNxIcEU6d3HerGdmyxiFg GPqwithxRW28xtVZuypcEYHbr31DMgDHIjgNxWM1Srk0cKW5JjSS+xrr7YLXxXl+Iyl45M41jyW 2Q8HfsLZ+JPrgIqbSCDsrPwzsLMOC6reI2Oa7BL9oYU+raIb44D3x9W5SaXF0pj32ImyVmeF+3M d29a0qvLglcK7sLUScLGVjBUZsCJcPj6syc9D4QGd2y0oEB4Bm8kfZr+47Qqw== X-Google-Smtp-Source: AGHT+IGY+XCJvxMBIZ+HThERjNXncTtFcruCLfZ72BdFMv3vmRIgxjd7ygYKOJiD0ORhulrxl1l94w== X-Received: by 2002:a05:6402:27cb:b0:5d9:f362:1686 with SMTP id 4fb4d7f45d1cf-5d9f3621959mr5507086a12.21.1736924036001; Tue, 14 Jan 2025 22:53:56 -0800 (PST) Received: from localhost ([196.207.164.177]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5d9900c440bsm6865481a12.26.2025.01.14.22.53.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Jan 2025 22:53:55 -0800 (PST) Date: Wed, 15 Jan 2025 09:53:52 +0300 From: Dan Carpenter To: Yu Kuai Cc: Song Liu , Coly Li , Mike Snitzer , linux-raid@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: [PATCH next] md/md-linear: Fix a NULL vs IS_ERR() bug in linear_add() Message-ID: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Disposition: inline X-Mailer: git-send-email haha only kidding Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The linear_conf() returns error pointers, it doesn't return NULL. Update the error checking to match. Fixes: 127186cfb184 ("md: reintroduce md-linear") Signed-off-by: Dan Carpenter Reviewed-by: Yu Kuai --- drivers/md/md-linear.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/md/md-linear.c b/drivers/md/md-linear.c index 53bc3fda9edb..a382929ce7ba 100644 --- a/drivers/md/md-linear.c +++ b/drivers/md/md-linear.c @@ -204,8 +204,8 @@ static int linear_add(struct mddev *mddev, struct md_rd= ev *rdev) rdev->saved_raid_disk =3D -1; =20 newconf =3D linear_conf(mddev, mddev->raid_disks + 1); - if (!newconf) - return -ENOMEM; + if (IS_ERR(newconf)) + return PTR_ERR(newconf); =20 /* newconf->raid_disks already keeps a copy of * the increased * value of mddev->raid_disks, WARN_ONCE() is just used to make --=20 2.45.2