From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2155) id 33E04385840D; Tue, 9 Apr 2024 20:36:55 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 33E04385840D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1712695015; bh=jtdJt2x61sWB4e2cUCWnZ5ieOCpvQoFfsVX6Hq3VzHQ=; h=From:To:Subject:Date:From; b=TtaCu9GrH8JIp4dzpaRT0hMNrOmaDjj2dizTv11j8/Ax8g3K7p9ari9Z2i3NDANlD OO9I8P4Ktj0OaPwu4zvqC5BpyKN6oTmgrl0nW+8C1w0NyjwR7BzdKDT/JBC97U9AUZ jyKnpcFTujS0L45UnHYRw/1ArXDTuOJrDx7tfPv8= Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Corinna Vinschen To: cygwin-cvs@sourceware.org Subject: [newlib-cygwin/main] Cygwin: fhandler_virtual::exists: always set fileid X-Act-Checkin: newlib-cygwin X-Git-Author: Corinna Vinschen X-Git-Refname: refs/heads/main X-Git-Oldrev: 38b51398359076eed01d8f1b0f9c061d16a658f5 X-Git-Newrev: 2855c35c41ed5c950e40ce0ae0d99d00185e05ad Message-Id: <20240409203655.33E04385840D@sourceware.org> Date: Tue, 9 Apr 2024 20:36:55 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dnewlib-cygwin.git;h=3D2855c35c41e= d5c950e40ce0ae0d99d00185e05ad commit 2855c35c41ed5c950e40ce0ae0d99d00185e05ad Author: Corinna Vinschen AuthorDate: Tue Apr 9 16:52:58 2024 +0200 Commit: Corinna Vinschen CommitDate: Tue Apr 9 17:02:35 2024 +0200 Cygwin: fhandler_virtual::exists: always set fileid =20 Commit a0a25849f9dd ("Cygwin: fhandler_virtual: move fileid to path_conv member") broke `ls -l /proc/'. Turns out, the commit forgot to set the fileid in case of a virtual root dir (i. e., returning virt_rootdir) in fhandlers utilizing fileid. This crashed opendir() due to a random fileid. =20 Make sure to set fileid in any case. =20 Fixes: a0a25849f9dd ("Cygwin: fhandler_virtual: move fileid to path_con= v member") Signed-off-by: Corinna Vinschen Diff: --- winsup/cygwin/fhandler/proc.cc | 6 +++++- winsup/cygwin/fhandler/process.cc | 6 +++++- winsup/cygwin/fhandler/procnet.cc | 6 +++++- winsup/cygwin/fhandler/procsysvipc.cc | 6 +++++- 4 files changed, 20 insertions(+), 4 deletions(-) diff --git a/winsup/cygwin/fhandler/proc.cc b/winsup/cygwin/fhandler/proc.cc index 7629b54d29db..baf0cae1e8f9 100644 --- a/winsup/cygwin/fhandler/proc.cc +++ b/winsup/cygwin/fhandler/proc.cc @@ -180,7 +180,10 @@ fhandler_proc::exists () debug_printf ("exists (%s)", path); path +=3D proc_len; if (*path =3D=3D 0) - return virt_rootdir; + { + fileid () =3D 0; + return virt_rootdir; + } virt_tab_t *entry =3D virt_tab_search (path + 1, false, proc_tab, PROC_LINK_COUNT); if (entry) @@ -188,6 +191,7 @@ fhandler_proc::exists () fileid () =3D entry - proc_tab; return entry->type; } + fileid () =3D -1; return virt_none; } =20 diff --git a/winsup/cygwin/fhandler/process.cc b/winsup/cygwin/fhandler/pro= cess.cc index 20169d22fe25..37bdff84e322 100644 --- a/winsup/cygwin/fhandler/process.cc +++ b/winsup/cygwin/fhandler/process.cc @@ -95,7 +95,10 @@ fhandler_process::exists () while (*path !=3D 0 && !isdirsep (*path)) path++; if (*path =3D=3D 0) - return virt_rootdir; + { + fileid () =3D 0; + return virt_rootdir; + } =20 virt_tab_t *entry =3D virt_tab_search (path + 1, true, process_tab, PROCESS_LINK_COUNT); @@ -122,6 +125,7 @@ fhandler_process::exists () } } } + fileid () =3D -1; return virt_none; } =20 diff --git a/winsup/cygwin/fhandler/procnet.cc b/winsup/cygwin/fhandler/pro= cnet.cc index 112aee8a2dad..631fe8cc1e43 100644 --- a/winsup/cygwin/fhandler/procnet.cc +++ b/winsup/cygwin/fhandler/procnet.cc @@ -48,7 +48,10 @@ fhandler_procnet::exists () while (*path !=3D 0 && !isdirsep (*path)) path++; if (*path =3D=3D 0) - return virt_rootdir; + { + fileid () =3D 0; + return virt_rootdir; + } =20 virt_tab_t *entry =3D virt_tab_search (path + 1, false, procnet_tab, PROCNET_LINK_COUNT); @@ -59,6 +62,7 @@ fhandler_procnet::exists () fileid () =3D entry - procnet_tab; return entry->type; } + fileid () =3D -1; return virt_none; } =20 diff --git a/winsup/cygwin/fhandler/procsysvipc.cc b/winsup/cygwin/fhandler= /procsysvipc.cc index b322c4601643..dac565c07092 100644 --- a/winsup/cygwin/fhandler/procsysvipc.cc +++ b/winsup/cygwin/fhandler/procsysvipc.cc @@ -61,7 +61,10 @@ fhandler_procsysvipc::exists () while (*path !=3D 0 && !isdirsep (*path)) path++; if (*path =3D=3D 0) - return virt_rootdir; + { + fileid () =3D 0; + return virt_rootdir; + } =20 virt_tab_t *entry =3D virt_tab_search (path + 1, true, procsysvipc_tab, PROCSYSVIPC_LINK_COUNT); @@ -78,6 +81,7 @@ fhandler_procsysvipc::exists () fileid () =3D entry - procsysvipc_tab; return entry->type; } + fileid () =3D -1; return virt_none; }