Skip to content

src/loader: use Cmdline instead CStr in load_cmdline() #72

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 15, 2021

Conversation

jinankjain
Copy link

Fixes #62

Tests do not work with container_version 5 because of old rust compiler.
Update it to the latest version of rustvmm/dev container i.e., 11.

Signed-off-by: Jinank Jain <jinankj@amazon.de>
load_cmdline() uses CStr for representing linux cmdline but Struct
Cmdline would be a better match for it. Thus replace CStr with Cmdline.

Fixes rust-vmm#62

Signed-off-by: Jinank Jain <jinankj@amazon.de>
@alxiord alxiord merged commit 2bc081e into rust-vmm:master Mar 15, 2021
@andreeaflorescu andreeaflorescu mentioned this pull request Sep 19, 2022
3 tasks
andreitraistaru pushed a commit to andreitraistaru/linux-loader that referenced this pull request Sep 19, 2022
Changing as_str() into as_cstring() in order to retrieve a
CString (which is a null terminated string) from the Cmdline
struct.

We found a bug introduced by the following PR:
rust-vmm#72
This bug was caused by the fact that method load_cmdline() was
changed to receive a Cmdline instead of a CStr. That leads to
the call of the as_str() method from the Cmdline to get the
representation of the kernel command line. The method as_str()
from Cmdline returns a plain string from Rust that is not null
terminated by default.

In this commit, we kept the load_cmdline() method to receive
a Cmdline but converted the as_str() method into as_cstring()
that returns a null terminated string now.

Signed-off-by: Traistaru Andrei Cristian <atc@amazon.com>
andreitraistaru pushed a commit to andreitraistaru/linux-loader that referenced this pull request Sep 21, 2022
Changing as_str() into as_cstring() in order to retrieve a
CString (which is a null terminated string) from the Cmdline
struct.

We found a bug introduced by the following PR:
rust-vmm#72
This bug was caused by the fact that method load_cmdline() was
changed to receive a Cmdline instead of a CStr. That leads to
the call of the as_str() method from the Cmdline to get the
representation of the kernel command line. The method as_str()
from Cmdline returns a plain string from Rust that is not null
terminated by default.

In this commit, we kept the load_cmdline() method to receive
a Cmdline but converted the as_str() method into as_cstring()
that returns a null terminated string now.

Signed-off-by: Traistaru Andrei Cristian <atc@amazon.com>
andreitraistaru pushed a commit to andreitraistaru/linux-loader that referenced this pull request Sep 21, 2022
Changing as_str() into as_cstring() in order to retrieve a
CString (which is a null terminated string) from the Cmdline
struct.

We found a bug introduced by the following PR:
rust-vmm#72
This bug was caused by the fact that method load_cmdline() was
changed to receive a Cmdline instead of a CStr. That leads to
the call of the as_str() method from the Cmdline to get the
representation of the kernel command line. The method as_str()
from Cmdline returns a plain string from Rust that is not null
terminated by default.

In this commit, we kept the load_cmdline() method to receive
a Cmdline but converted the as_str() method into as_cstring()
that returns a null terminated string now.

Signed-off-by: Traistaru Andrei Cristian <atc@amazon.com>
andreitraistaru pushed a commit to andreitraistaru/linux-loader that referenced this pull request Sep 22, 2022
Changing as_str() into as_cstring() in order to retrieve a
CString (which is a null terminated string) from the Cmdline
struct.

We found a bug introduced by the following PR:
rust-vmm#72
This bug was caused by the fact that method load_cmdline() was
changed to receive a Cmdline instead of a CStr. That leads to
the call of the as_str() method from the Cmdline to get the
representation of the kernel command line. The method as_str()
from Cmdline returns a plain string from Rust that is not null
terminated by default.

In this commit, we kept the load_cmdline() method to receive
a Cmdline but converted the as_str() method into as_cstring()
that returns a null terminated string now.

Signed-off-by: Traistaru Andrei Cristian <atc@amazon.com>
andreitraistaru pushed a commit to andreitraistaru/linux-loader that referenced this pull request Sep 22, 2022
Changing as_str() into as_cstring() in order to retrieve a
CString (which is a null terminated string) from the Cmdline
struct.

We found a bug introduced by the following PR:
rust-vmm#72
This bug was caused by the fact that method load_cmdline() was
changed to receive a Cmdline instead of a CStr. That leads to
the call of the as_str() method from the Cmdline to get the
representation of the kernel command line. The method as_str()
from Cmdline returns a plain string from Rust that is not null
terminated by default.

In this commit, we kept the load_cmdline() method to receive
a Cmdline but converted the as_str() method into as_cstring()
that returns a null terminated string now.

Signed-off-by: Traistaru Andrei Cristian <atc@amazon.com>
andreeaflorescu pushed a commit that referenced this pull request Sep 22, 2022
Changing as_str() into as_cstring() in order to retrieve a
CString (which is a null terminated string) from the Cmdline
struct.

We found a bug introduced by the following PR:
#72
This bug was caused by the fact that method load_cmdline() was
changed to receive a Cmdline instead of a CStr. That leads to
the call of the as_str() method from the Cmdline to get the
representation of the kernel command line. The method as_str()
from Cmdline returns a plain string from Rust that is not null
terminated by default.

In this commit, we kept the load_cmdline() method to receive
a Cmdline but converted the as_str() method into as_cstring()
that returns a null terminated string now.

Signed-off-by: Traistaru Andrei Cristian <atc@amazon.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Update load_cmdline to use Cmdline instead of CStr
3 participants