Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
K
kernel
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
23
Issues
23
List
Boards
Labels
Service Desk
Milestones
Merge Requests
10
Merge Requests
10
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
redox-os
kernel
Commits
b4575711
Verified
Commit
b4575711
authored
Feb 02, 2019
by
Jeremy Soller
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix logic error when cloning file descriptor in user scheme fmap
parent
ca511b98
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
16 additions
and
3 deletions
+16
-3
src/scheme/user.rs
src/scheme/user.rs
+16
-3
No files found.
src/scheme/user.rs
View file @
b4575711
...
...
@@ -317,9 +317,22 @@ impl Scheme for UserScheme {
let
contexts
=
context
::
contexts
();
let
context_lock
=
contexts
.current
()
.ok_or
(
Error
::
new
(
ESRCH
))
?
;
let
context
=
context_lock
.read
();
let
desc
=
context
.get_file
(
FileHandle
(
file
))
.ok_or
(
Error
::
new
(
EBADF
))
?
.clone
();
// TODO: Faster, cleaner mechanism to get descriptor
let
scheme
=
inner
.scheme_id
.load
(
Ordering
::
SeqCst
);
let
mut
desc_res
=
Err
(
Error
::
new
(
EBADF
));
for
context_file_opt
in
context
.files
.lock
()
.iter
()
{
if
let
Some
(
context_file
)
=
context_file_opt
{
let
(
context_scheme
,
context_number
)
=
{
let
desc
=
context_file
.description
.read
();
(
desc
.scheme
,
desc
.number
)
};
if
context_scheme
==
scheme
&&
context_number
==
file
{
desc_res
=
Ok
(
context_file
.clone
());
break
;
}
}
}
let
desc
=
desc_res
?
;
(
context
.id
,
context
.euid
,
context
.egid
,
Arc
::
downgrade
(
&
context_lock
),
desc
)
};
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment