rpc_pipefs: Replace one label in bl_resolve_deviceid()

Commit Message

Markus Elfring Dec. 29, 2023, 12:45 p.m. UTC

From: Markus Elfring <[e-mail]>
Date: Fri, 29 Dec 2023 13:18:56 +0100

The kfree() function was called in one case by
the bl_resolve_deviceid() function during error handling
even if the passed data structure member contained a null pointer.
This issue was detected by using the Coccinelle software.

Thus use an other label.

Signed-off-by: Markus Elfring <[e-mail]>
---
 fs/nfs/blocklayout/rpc_pipefs.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--
2.43.0

Comments

Benjamin Coddington Jan. 2, 2024, 12:32 p.m. UTC | #1

On 29 Dec 2023, at 7:45, Markus Elfring wrote:

> From: Markus Elfring <[e-mail]>
> Date: Fri, 29 Dec 2023 13:18:56 +0100
>
> The kfree() function was called in one case by
> the bl_resolve_deviceid() function during error handling
> even if the passed data structure member contained a null pointer.
> This issue was detected by using the Coccinelle software.
>
> Thus use an other label.
>
> Signed-off-by: Markus Elfring <[e-mail]>

Reviewed-by: Benjamin Coddington <[e-mail]>

Ben

Patch

diff --git a/fs/nfs/blocklayout/rpc_pipefs.c b/fs/nfs/blocklayout/rpc_pipefs.c
index 6c977288cc28..d8d50a88de04 100644
--- a/fs/nfs/blocklayout/rpc_pipefs.c
+++ b/fs/nfs/blocklayout/rpc_pipefs.c
@@ -75,7 +75,7 @@  bl_resolve_deviceid(struct nfs_server *server, struct pnfs_block_volume *b,
 	msg->len = sizeof(*bl_msg) + b->simple.len;
 	msg->data = kzalloc(msg->len, gfp_mask);
 	if (!msg->data)
-		goto out_free_data;
+		goto out_unlock;

 	bl_msg = msg->data;
 	bl_msg->type = BL_DEVICE_MOUNT;