Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Added Debian 12.5 support #88

Merged
merged 3 commits into from
Mar 17, 2024
Merged

Added Debian 12.5 support #88

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
47ffe8a
testsuite/coreutils-echo: use debian 12.5
vitalych Mar 10, 2024
11d273d
vagrant: added debian 12.5
vitalych Mar 10, 2024
e722bc9
docs: updated debian version
vitalych Mar 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/src/BuildingS2E.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ to run them manually.

.. note::

S2E builds and runs on Ubuntu 22.04 LTS and Debian 11 (64-bit).
S2E builds and runs on Ubuntu 22.04 LTS and Debian 11/12 (64-bit).
Earlier versions may still work, but we do not support them anymore.


Expand Down
8 changes: 4 additions & 4 deletions docs/src/Howtos/Coverage/index.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ is concrete and we will not instruct S2E to make it symbolic).

.. code-block:: console
s2e new_project --image debian-11.3-i386 /path/to/coreutils-8.26/build/bin/cat /etc/fstab
s2e new_project --image debian-12.5-i386 /path/to/coreutils-8.26/build/bin/cat /etc/fstab
After creating the project, run S2E. This should take a few seconds and terminate.

Expand Down Expand Up @@ -242,7 +242,7 @@ folder.

.. code-block:: console
s2e new_project -n cat-symb --image debian-11.3-i386 /path/to/coreutils-8.26/build/bin/cat -T @@
s2e new_project -n cat-symb --image debian-12.5-i386 /path/to/coreutils-8.26/build/bin/cat -T @@
The ``@@`` symbol tells ``s2e-env`` to generate a bootstrap file that will run ``cat`` with a symbolic file as input.
By default this symbolic file will be a 256 byte file filled with ``null`` bytes as concolic values.
Expand Down Expand Up @@ -387,7 +387,7 @@ other program.

.. code-block:: console
s2e new_project -n linux-kernel -i debian-11.3-x86_64 --no-target --type linux
s2e new_project -n linux-kernel -i debian-12.5-x86_64 --no-target --type linux
2. Add ``vmlinux`` to the ``ModuleExecutionDetector`` plugin configuration:

Expand Down Expand Up @@ -526,7 +526,7 @@ The typical symptom is that the coverage report is empty. Here is a checklist to
$ ls -l /home/user/s2e/env/projects/my_project
...
lrwxrwxrwx 1 user user 51 Apr 8 18:34 guestfs -> /mnt/home3/guest-images/debian-11.3-x86_64/guestfs
lrwxrwxrwx 1 user user 51 Apr 8 18:34 guestfs -> /mnt/home3/guest-images/debian-12.5-x86_64/guestfs
...
- Check that ``projects/my_project/guestfs/vmlinux`` is valid and contains line information (try ``addr2line``)
Expand Down
2 changes: 1 addition & 1 deletion docs/src/Profiling/ProfilingS2E.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ with ``libs2e.so`` and causes crashes. The disadvantage is that you cannot injec
.. code-block:: bash
$ ps aux | grep qemu
ubuntu 31044 96.7 4.7 3487216 1191460 pts/8 Sl 13:54 0:03 /home/ubuntu/s2e/env/install/bin/qemu-system-i386 -drive file=/home/ubuntu/s2e/env/images/debian-11.3-i386/image.raw.s2e,format=s2e,cache=writeback -k en-us -nographic -monitor null -m 256M -enable-kvm -serial file:serial.txt -net none -net nic,model=e1000 -loadvm ready
ubuntu 31044 96.7 4.7 3487216 1191460 pts/8 Sl 13:54 0:03 /home/ubuntu/s2e/env/install/bin/qemu-system-i386 -drive file=/home/ubuntu/s2e/env/images/debian-12.5-i386/image.raw.s2e,format=s2e,cache=writeback -k en-us -nographic -monitor null -m 256M -enable-kvm -serial file:serial.txt -net none -net nic,model=e1000 -loadvm ready
$ heaptrack -p 31044
heaptrack output will be written to "/home/ubuntu/heaptrack/build/heaptrack.qemu-system-i38.31044.gz"
Expand Down
4 changes: 2 additions & 2 deletions docs/src/Tutorials/MSOffice/index.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ this case Windows and Microsoft Office. S2E supports various combinations of Win
Available images:
* cgc_debian-9.2.1-i386 - Debian i386 image with CGC kernel and user-space packages
* debian-11.3-i386 - Debian i386 image
* debian-11.3-x86_64 - Debian x86_64 image
* debian-12.5-i386 - Debian i386 image
* debian-12.5-x86_64 - Debian x86_64 image
* windows-10pro1909-x86_64 - Windows 10 Pro 1909 x86_64
* windows-10pro1909-x86_64/office2010 - Microsoft Office 2010 32-bit
* windows-10pro1909-x86_64/office2013 - Microsoft Office 2013 32-bit
Expand Down
2 changes: 1 addition & 1 deletion docs/src/Tutorials/SystemTap/index.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ two Docker images on your host: ``linux-build-i386`` and ``linux-build-x86_64``.
# that does not target any particular binary. You will then later customize the project manually in order to
# fetch the .ko file generated by SystemTap.
host $ cd /home/user/s2e/env
host $ s2e new_project -n systemtap -i debian-11.3-i386 --no-target --type linux
host $ s2e new_project -n systemtap -i debian-12.5-i386 --no-target --type linux
# Start the docker container in order to build the hello world SystemTap probe
host $ docker run --rm -ti -v $HOME:$HOME linux-build-i386
Expand Down
6 changes: 3 additions & 3 deletions docs/src/s2e-env.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ You will find in the documentation various tutorials that go deeper into various

.. note::

S2E builds and runs on Ubuntu 22.04 LTS and Debian 11 (64-bit).
S2E builds and runs on Ubuntu 22.04 LTS and Debian 11/12 (64-bit).
Earlier versions may still work, but we do not support them anymore.


Expand Down Expand Up @@ -126,12 +126,12 @@ You will need a virtual machine image to run your analysis target in. To see wha
s2e image_build
This will list an image template name and a description of that image. For example, to build a Linux Debian 11.3 i386
This will list an image template name and a description of that image. For example, to build a Linux Debian 12.5 i386
image run:

.. code-block:: console
s2e image_build debian-11.3-i386
s2e image_build debian-12.5-i386
This will:

Expand Down
4 changes: 2 additions & 2 deletions testsuite/coreutils-echo/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ test:
- [abc]

targets:
- {{ s2e_images }}/debian-11.3-i386/guestfs/bin/echo
- {{ s2e_images }}/debian-12.5-i386/guestfs/bin/echo

build-options:
post-project-generation-script: fix-config.sh

target-images:
- debian-11.3-i386
- debian-12.5-i386
2 changes: 1 addition & 1 deletion vagrant/Vagrantfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.

$boxes = ["debian/bullseye64", "generic/ubuntu2004", "generic/ubuntu2204"]
$boxes = ["debian/bullseye64", "debian/bookworm64", "generic/ubuntu2004", "generic/ubuntu2204"]

Vagrant.configure("2") do |config|
$boxes.to_enum.with_index(1).each do |box,i|
Expand Down
Loading