Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
R
relibc
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
redox-os
relibc
Commits
572f211b
Commit
572f211b
authored
8 months ago
by
Derick Eddington
Browse files
Options
Downloads
Patches
Plain Diff
Fix `getgrgid_r`.
parent
7c81de68
No related branches found
No related tags found
1 merge request
!481
Four distinct fixes for significant incorrectness bugs, as three small commits
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/header/grp/mod.rs
+23
-4
23 additions, 4 deletions
src/header/grp/mod.rs
with
23 additions
and
4 deletions
src/header/grp/mod.rs
+
23
−
4
View file @
572f211b
...
...
@@ -310,20 +310,38 @@ pub unsafe extern "C" fn getgrgid_r(
buflen
:
usize
,
result
:
*
mut
*
mut
group
,
)
->
c_int
{
// In case of error or the requested entry is not found.
*
result
=
ptr
::
null_mut
();
let
Ok
(
db
)
=
File
::
open
(
c_str!
(
"/etc/group"
),
fcntl
::
O_RDONLY
)
else
{
return
ENOENT
;
};
for
line
in
BufReader
::
new
(
db
)
.lines
()
{
let
Ok
(
line
)
=
line
else
{
return
EINVAL
};
let
Ok
(
mut
grp
)
=
parse_grp
(
let
grp
=
match
parse_grp
(
line
,
Some
(
DestBuffer
{
ptr
:
buffer
as
*
mut
u8
,
len
:
buflen
,
}),
)
else
{
return
EINVAL
;
)
{
Ok
(
grp
)
=>
grp
,
Err
(
err
)
=>
{
return
match
err
{
Error
::
BufTooSmall
=>
ERANGE
,
Error
::
EOF
|
Error
::
SyntaxError
|
Error
::
FromUtf8Error
(
_
)
|
Error
::
ParseIntError
(
_
)
|
Error
::
Other
=>
EINVAL
,
Error
::
Misc
(
io_err
)
=>
match
io_err
.kind
()
{
io
::
ErrorKind
::
InvalidData
|
io
::
ErrorKind
::
UnexpectedEof
=>
EINVAL
,
io
::
ErrorKind
::
NotFound
=>
ENOENT
,
_
=>
EIO
,
},
}
}
};
if
grp
.reference.gr_gid
==
gid
{
...
...
@@ -334,7 +352,8 @@ pub unsafe extern "C" fn getgrgid_r(
}
}
return
ENOENT
;
// The requested entry was not found.
return
0
;
}
// MT-Safe locale
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment