From patchwork Tue Feb 13 18:09:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Carpenter X-Patchwork-Id: 200543 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:bc8a:b0:106:860b:bbdd with SMTP id dn10csp717038dyb; Tue, 13 Feb 2024 10:10:44 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCU/zbn9X8mKZrRcHR+lgow8zYMq0zXwM0nQcQ1A9wd6X6YlidaDNmPJ7XXIf5tBN9nhn1lg0nNL+JPvRqQNIK2vIMh6AA== X-Google-Smtp-Source: AGHT+IGrSsE/G6CXkiSHbn3RwqFxWKtaX5ktmswr99G8uBgaruVqUntcIJARGO2RBC2bchUUAh0y X-Received: by 2002:a05:651c:1994:b0:2d0:9f8f:c37f with SMTP id bx20-20020a05651c199400b002d09f8fc37fmr334611ljb.34.1707847843980; Tue, 13 Feb 2024 10:10:43 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707847843; cv=pass; d=google.com; s=arc-20160816; b=kdxWhDUq2mrj+8WjZm/OWTC3fApchPlKiNLtkP/kLm3valy9c3mK41ldwzO1cvfH1+ DYw5Zu0mgLSymfc0fszQQvEm3i4uJhK5a40oJmnJzHWPnQjyryTyqN4qt6yCEh9Qrpap 6yOt2p7VGmoekQimUFfSIAaBDi4271lIvhd6JBb4gdGl9ZcEEyPhJOetzdLkdi1umPRK /j/1s5Ug7JBUTc+bBMLoRupQLZkG+h9Zawf3iE2A5hxFLXR2cKtELEg7EF+97kF7cYDb HALSMPEWdSGAGraNvQtCA8niTDwKWy9sgziKbEYj7xFOe9xuTtoA5XjAOyQuAaTLRO7v FKbw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-disposition:mime-version:list-unsubscribe:list-subscribe :list-id:precedence:message-id:subject:cc:to:from:date :dkim-signature; bh=ziAomXuWT8MH5zr/8s5imuynSnI7dntU0jZc1Z9tS6w=; fh=f9JKauFNJSHvQ/eBcdvyDro2Q+xrZdyDwnMuFjtHK70=; b=bNKWboBudAe46PVEzwzlq64NEQMKxgonMj+K4aPtX6Q752E0D0NwmB28RQZ1vXCxCl j22U/z9MUWXWnsaYuVvl6pcX+OLT8HNG6GGrnBCM0qxUgI5Yq8xlnHRKeCRiFoozXYIK rh+pTp5A+d3+m7iI0RFzJ2tRAhZUHXsCD3PcBoqul7x15/WU3BSqzM14xt6GiWQDb7Sp dlGBNB1eM2qDGuX5fUmREyay3WuyC99TWpU0aHFoPABG+ZDNPE/ezizcXtLB9YQ4uJz9 AM93q2T+HQ7BGnvGKb2jN2RIfNKcUa2gBUz0NZJFKAZBhAnyo7WgYt4YanfrWGQIT0AD ngFA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=W4zBG6bU; arc=pass (i=1 spf=pass spfdomain=linaro.org dkim=pass dkdomain=linaro.org dmarc=pass fromdomain=linaro.org); spf=pass (google.com: domain of linux-kernel+bounces-64060-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-64060-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org X-Forwarded-Encrypted: i=2; AJvYcCWR2gUbaGvGa/RZ6IWeQM0uR2iDcZaYJPQMxie5uFYb83mqXlf1WHDkR7ot9/FYa5GhNflf1gDhsqfEXWqujUOxSiUVdw== Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id d17-20020a50f691000000b005621a148057si101391edn.51.2024.02.13.10.10.43 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Feb 2024 10:10:43 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-64060-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=W4zBG6bU; arc=pass (i=1 spf=pass spfdomain=linaro.org dkim=pass dkdomain=linaro.org dmarc=pass fromdomain=linaro.org); spf=pass (google.com: domain of linux-kernel+bounces-64060-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-64060-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id 6956E1F24703 for ; Tue, 13 Feb 2024 18:10:43 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 4A2C560860; Tue, 13 Feb 2024 18:10:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="W4zBG6bU" Received: from mail-ed1-f43.google.com (mail-ed1-f43.google.com [209.85.208.43]) (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 C319B605B1 for ; Tue, 13 Feb 2024 18:10:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707847811; cv=none; b=ZiwVLU0gZT3G9k0NcU6VUHOn6UAAU6Iuc371N4xqXEFTyGVMp5eMZHNmvqx+IhPy7vPhbi/+LbYDAjmobK3wXNgFPOdShFUbvRGy29WQuxRIbBQoz++ff4ctVdYd4FAZbMcJiEjU+WvDDxcjFW9mwIumWHCqbjFk4h3EEwBYFo0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707847811; c=relaxed/simple; bh=UNgcle+d9r14K8JpjkfYo0Rz2jZg7GDPQvbA5DnyHIY=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type: Content-Disposition; b=fzB5NWaE/fk/v/wgKdj5hfKkp6/+pQBMEC1QmAtsEqnN4aNvr/P8mbHicz/+0zrft5XenNZUZdcXkyhZ5VZhj67Xaa3F4AsoWOI/0I0r9jRK9R1JoD0YD60QNWz4/tLfY+yGq86+OmzoxLrvbmOsQHQ+zixlMQ9j4HVEc8HQ0Z0= 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=W4zBG6bU; arc=none smtp.client-ip=209.85.208.43 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 Received: by mail-ed1-f43.google.com with SMTP id 4fb4d7f45d1cf-55f279dca99so7379215a12.3 for ; Tue, 13 Feb 2024 10:10:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1707847808; x=1708452608; 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=ziAomXuWT8MH5zr/8s5imuynSnI7dntU0jZc1Z9tS6w=; b=W4zBG6bU2FvscZnF/LLJSIHajEUGwC1vc+FSoQi5TriqhYmN98o7Sr/xlHE9pUwlfp 6KkjTqgqhkgQX/nEIHGgqUAaF7VpAO4DoprpWFSU8YP4Eu/S8uvqa67+zDMm9Ym0hIAK /fUwrxAFV3MuVFQ4WvG2Bo/EfUlTncZS/VEyG/UwS+EYIxuUM3Q+aAO0EiBxdk37j6Rr kvCLqZbZxVtpEQdu277HyQtLMBkKA2ip+8Zy5x8bU5eKGrIFwUw29RndP0eI+HQrZUh/ FTwaINLBc43EsEq/Vn6Ojf8vp9rMNjohWvs4WMIH7ikUQ+Cajuh3tEoc+mBCq/4M9/dI WZHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707847808; x=1708452608; 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=ziAomXuWT8MH5zr/8s5imuynSnI7dntU0jZc1Z9tS6w=; b=LZVihRbwJFyzFSZkJKuS04WZ1m4x/XXKCYqLRYJdR3R+y+YryjMMbQrpj8AEl/V6Bn qayYh8u1ooJin4LGfjeDmMpl6bR1v/6f8suTZ9PpK7yIqbhvU+6xQd7BS7sc8KZKZyJp 9XiPC87vZJfAtsA9uKgitELIlGkpgyP2qSy/4avK1LMOA5Qi5r+ynWGmepNgHgBJWl0p BNsTfxUT3/3tz8e1iljT83ajuD6q+lGg/Mt38Hdc6AnZeWKgPKIYxaq5pTLAvDZeNTry UOzOBLFJXV5yHdnEBmU/R7KhJ9bygPKxk+XXjB07u2l5k8gHqRkNMoBb3Bu0uBxw07wG m4qQ== X-Forwarded-Encrypted: i=1; AJvYcCWxiBUdtysvLzmjdSqc7U41KxfgnxwBVipAo0EK2Gu/AcQi9JZXSnPAKWnQ+7h3fI/GGVd++Q2GFGDMVX/T9NLNjCycNEVpogajx2fR X-Gm-Message-State: AOJu0YyYUqzVk/hiSODie/L6b/CD8ebIuectienkCp4Cjh5MrDTha8ae WJO7wMnA9NHRpfsP+CFROdeddKG3wmhsD2VU/4d4o0AKp3zAKR8BZQ80GKs8cnk= X-Received: by 2002:a05:6402:2c9:b0:561:a444:8e49 with SMTP id b9-20020a05640202c900b00561a4448e49mr321854edx.0.1707847807927; Tue, 13 Feb 2024 10:10:07 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCWKqe9LXaXCTJL+0+XDewhVE3YzUr7ESGe3puDPcSskby8iGkPYz0oTenO+aCQtAlemdNeKRkzKYJlPZOsdV/bkrYnGTABsLqMej8xFl5Venr0cVbu+kUwioToW0tuN37GrnXm1zl8RNNt+PmS9NRMOlig5wSYbq4nHSKJpn1Gxs+/FrLQnUB+R+1pZL8dayot7Z/MxtO8CbqlbZbNekuTO8DqhNqGbw5LLLxeAvovKEdJcQctLm/+1+ctUpF5TT2LAMp/333ubfflOQkXZxMefbY8cKqI/KPZcGSN/N9/5Knu6C059CGx3T0q9AbJAMzqc4sRCchCipGb6gWHlYZ6n/fkcMtUhnfoy5BIRRfR6rQ== Received: from localhost ([102.222.70.76]) by smtp.gmail.com with ESMTPSA id y24-20020a056402135800b005606b3d835fsm3935468edw.50.2024.02.13.10.10.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Feb 2024 10:10:07 -0800 (PST) Date: Tue, 13 Feb 2024 21:09:57 +0300 From: Dan Carpenter To: Karol Herbst Cc: Lyude Paul , Danilo Krummrich , David Airlie , Daniel Vetter , Dave Airlie , Dan Carpenter , dri-devel@lists.freedesktop.org, nouveau@lists.freedesktop.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: [PATCH] drm/nouveau/mmu/r535: uninitialized variable in r535_bar_new_() 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 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1790808260973218789 X-GMAIL-MSGID: 1790808260973218789 If gf100_bar_new_() fails then "bar" is not initialized. Fixes: 5bf0257136a2 ("drm/nouveau/mmu/r535: initial support") Signed-off-by: Dan Carpenter --- It looks like this was intended to handle a failure from the "rm" func but "rm" can't actually fail so it's easier to write the error handling for the code as-is. drivers/gpu/drm/nouveau/nvkm/subdev/bar/r535.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/bar/r535.c b/drivers/gpu/drm/nouveau/nvkm/subdev/bar/r535.c index 4135690326f4..3a30bea30e36 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/bar/r535.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/bar/r535.c @@ -168,12 +168,11 @@ r535_bar_new_(const struct nvkm_bar_func *hw, struct nvkm_device *device, rm->flush = r535_bar_flush; ret = gf100_bar_new_(rm, device, type, inst, &bar); - *pbar = bar; if (ret) { - if (!bar) - kfree(rm); + kfree(rm); return ret; } + *pbar = bar; bar->flushBAR2PhysMode = ioremap(device->func->resource_addr(device, 3), PAGE_SIZE); if (!bar->flushBAR2PhysMode)