From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-io1-f97.google.com (mail-io1-f97.google.com [209.85.166.97]) (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 B89E91DF74E for ; Fri, 28 Feb 2025 23:59:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.166.97 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740787169; cv=none; b=VKAPhp55XBlb3iuj0LZDJRU2inYeUtV5YlphnJdpc7obrjEuk0GbCHJBErx+FZ8k3AZirbcV3nTLwZXTS+3ACArKQKhBFPNeXuFVsWJi+ZdtCRI/GGcwc/0x2j1pIW0SSHUQQwXadLoEG7trs7VuvDI+iOXnOT6UA8mlWan6cL8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740787169; c=relaxed/simple; bh=QFjWgNXy9Kx8/WOzwsIn/1I5TFpqOsgdfFlTxY3gJ2I=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=pp0OUXY5BM0axzXY2UoOiNhVq/6FAz64EA7wVvFRdbHcM3Lf79L+AQsw2h1/GMuy/OBfeaUQR8WlMzg5NsEOIVG+NX5eYe6BBqYddD6UaugVGHH8DCIHLZ2lnKPr9c8JZUziKDMDr/7HdxnlEYUTsYw3jTBPAngBTv11UYoCWsI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=purestorage.com; spf=fail smtp.mailfrom=purestorage.com; dkim=pass (2048-bit key) header.d=purestorage.com header.i=@purestorage.com header.b=gqnn/7va; arc=none smtp.client-ip=209.85.166.97 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=purestorage.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=purestorage.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=purestorage.com header.i=@purestorage.com header.b="gqnn/7va" Received: by mail-io1-f97.google.com with SMTP id ca18e2360f4ac-85597c291f1so6295239f.1 for ; Fri, 28 Feb 2025 15:59:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=purestorage.com; s=google2022; t=1740787166; x=1741391966; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=hK6QOjfXK+fgEevkc21x4GT0Qq5JPIuUXpL7Fx2XzDA=; b=gqnn/7vaDIXgAqm8A5CHGZtj+IRGGog0VDj/YYCBW+1EfJ/X7ZJyR2cPp6HkHg/Yxk 8vDmP/qOG5fGRraMcV7QyFgCKHjtE6LAHhw3PXDShuz2TOxTu4MQDRs9aBhTwZZhah5I cYkuEzL3UA5XEke9Ar1wulAmRvCnEwAbiRaYEV9ST2d/79e0+1+UpRTa7F9dui+P0air 83VVNhJmADSw5k4itOjCTtOCHnrc+fSu7UsF0VPkc1tfvSjqVj4LmWIrMGayi1HBkT3w rVkc8bjzNxb4ha1j6Atvhi9l9JOgfSiGj2OJfXWELZ6F2OCYOfVX/1UDoIXIH2Ke0kHg 8MAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740787166; x=1741391966; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=hK6QOjfXK+fgEevkc21x4GT0Qq5JPIuUXpL7Fx2XzDA=; b=ppTOuyHNWgPxNul2b/znkCcDu3SczUz2Y1iNBdgaszFT1FeXUksj3rYCvb32gDyWgq Rd2a+RhGHUksyPEyMc/cQFXmI7Y86rUlD3rxk8jSbQirQ4bdQhKiEHN4PoT0UbITs2Pq UQr4LzrbUw+8L/gwarLVorKjAW1nLbSrr3n+NAAAgy4oZ5OyfgDWULutZhbR78r1Fs+D cS79XrZE/pQ1FJDqKx3Dz3JAdyZBnIZbottTh96Eod2PEqep8fL+f3g8YL6E4E9ggJ99 70MbQlmFX4Ae1pLvvfbD5UHTfloYHTRQcHOM0ZP+goluCpcnxBZYylSV4Tk35mATNFdc L/8w== X-Forwarded-Encrypted: i=1; AJvYcCXORzdczidioXLnMm5girvwFnDGFUZlvz8iMGmwMAjEDqeX3CMQcdKYqrTjlumVQLqBryZqxvno3A==@vger.kernel.org X-Gm-Message-State: AOJu0YwgytF8yeprx2O0UW1dHAzW93GKJInwY7abYxTDYE2HAW/11nz1 BWOpkHSMwGb6b6sIIt5Khio64Kd2F0iu69rMeD+LYGCe4Pj8qoOTmPEJmnSBGXT2Gxo5criNLtK iU2fR/zcEEq0NRIqZ+0ZVdZtXb9UbASyh X-Gm-Gg: ASbGncsZEt02fBKC80xdARvUg/tVdSG3Ar3l4VgQ7qlDwZvc3NsiD5uTljqowmDgOBq qviL8OdIYF3pDtY6k+r40TpVrgP6oldj+0wjDj1SmKzs283kgWfSKp0Q54vT67X4pSOoiMWCMuJ S8dJlbv9fiUgpZniX9WdXs8mDZ0kN8eUU+Nkf+PmSQg5e4mcq4fTkK4FmUgwf2OCbLvLZot9cqW 5T/v75qsRNqibr7Nn4d0kmN5MyOaWHRy9Qjhp15SoptQyAdwQ7EJYopauFSLgz8VZ9fzfpu8k9Z B6UmLbp7bfzVJby6upZY3ghRhGQbqIYOCWtHcyS5UJf5wqvY X-Google-Smtp-Source: AGHT+IG/Nq900tpHhaf/0mNrSn5JRVXcZZ+nNO4WfDhJCn+LVSSYjcj85ej1aZMx9Yzu7PxQoceMQhcBDyrs X-Received: by 2002:a05:6e02:1fc7:b0:3d1:936d:1e22 with SMTP id e9e14a558f8ab-3d3e6e45d8emr12968445ab.1.1740787166685; Fri, 28 Feb 2025 15:59:26 -0800 (PST) Received: from c7-smtp-2023.dev.purestorage.com ([208.88.159.128]) by smtp-relay.gmail.com with ESMTPS id 8926c6da1cb9f-4f061c5563dsm256932173.16.2025.02.28.15.59.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Feb 2025 15:59:26 -0800 (PST) X-Relaying-Domain: purestorage.com Received: from dev-csander.dev.purestorage.com (dev-csander.dev.purestorage.com [10.7.70.37]) by c7-smtp-2023.dev.purestorage.com (Postfix) with ESMTP id 8845F34028F; Fri, 28 Feb 2025 16:59:25 -0700 (MST) Received: by dev-csander.dev.purestorage.com (Postfix, from userid 1557716354) id 7D6AEE41AF2; Fri, 28 Feb 2025 16:59:25 -0700 (MST) From: Caleb Sander Mateos To: Jens Axboe , Pavel Begunkov Cc: Caleb Sander Mateos , io-uring@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 4/5] io_uring/rsrc: avoid NULL node check on io_sqe_buffer_register() failure Date: Fri, 28 Feb 2025 16:59:13 -0700 Message-ID: <20250228235916.670437-4-csander@purestorage.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20250228235916.670437-1-csander@purestorage.com> References: <20250228235916.670437-1-csander@purestorage.com> Precedence: bulk X-Mailing-List: io-uring@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit The done: label is only reachable if node is non-NULL. So don't bother checking, just call io_free_node(). Signed-off-by: Caleb Sander Mateos --- io_uring/rsrc.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/io_uring/rsrc.c b/io_uring/rsrc.c index 398c6f427bcc..95def9e5f3a7 100644 --- a/io_uring/rsrc.c +++ b/io_uring/rsrc.c @@ -835,12 +835,11 @@ static struct io_rsrc_node *io_sqe_buffer_register(struct io_ring_ctx *ctx, } done: if (ret) { if (imu) io_free_imu(ctx, imu); - if (node) - io_free_node(ctx, node); + io_free_node(ctx, node); node = ERR_PTR(ret); } kvfree(pages); return node; } -- 2.45.2