michaelkuc6/blog_os
1
0
Fork 0
mirror of https://github.com/phil-opp/blog_os.git synced 2025-12-16 14:27:49 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1226 from SPuntte/fix-post-06-ub-panic

Browse Source 
Fix panics caused by misaligned pointer dereferences in "Double Faults" & "Introduction to Paging"
This commit is contained in:
Philipp Oppermann
2023-06-02 09:21:06 +02:00
committed by GitHub
parent 5baf50a5b4 cfd31a977d
commit a1b195ede0
9 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
blog/content/edition-2/posts/06-double-faults/index.fa.md
View File

@@ -49,7 +49,7 @@ pub extern "C" fn _start() -> ! {
// trigger a page fault // trigger a page fault
unsafe { unsafe {
*(0xdeadbeef as *mut u64) = 42; *(0xdeadbeef as *mut u8) = 42;
}; };
// as before // as before

2
blog/content/edition-2/posts/06-double-faults/index.ja.md
View File

@@ -45,7 +45,7 @@ pub extern "C" fn _start() -> ! {
// ページフォルトを起こす // ページフォルトを起こす
unsafe { unsafe {
*(0xdeadbeef as *mut u64) = 42; *(0xdeadbeef as *mut u8) = 42;
}; };
// 前回同様 // 前回同様

2
blog/content/edition-2/posts/06-double-faults/index.ko.md
View File

@@ -48,7 +48,7 @@ pub extern "C" fn _start() -> ! {
// 페이지 폴트 일으키기 // 페이지 폴트 일으키기
unsafe { unsafe {
*(0xdeadbeef as *mut u64) = 42; *(0xdeadbeef as *mut u8) = 42;
}; };
// 이전과 동일 // 이전과 동일

2
blog/content/edition-2/posts/06-double-faults/index.md
View File

@@ -42,7 +42,7 @@ pub extern "C" fn _start() -> ! {
// trigger a page fault // trigger a page fault
unsafe { unsafe {
*(0xdeadbeef as *mut u64) = 42; *(0xdeadbeef as *mut u8) = 42;
}; };
// as before // as before

2
blog/content/edition-2/posts/06-double-faults/index.zh-CN.md
View File

@@ -47,7 +47,7 @@ pub extern "C" fn _start() -> ! {
// trigger a page fault // trigger a page fault
unsafe { unsafe {
*(0xdeadbeef as *mut u64) = 42; *(0xdeadbeef as *mut u8) = 42;
}; };
// as before // as before

4
blog/content/edition-2/posts/08-paging-introduction/index.fa.md
View File

@@ -322,7 +322,7 @@ pub extern "C" fn _start() -> ! {
blog_os::init(); blog_os::init();
// new // new
let ptr = 0xdeadbeaf as *mut u32; let ptr = 0xdeadbeaf as *mut u8;
unsafe { *ptr = 42; } unsafe { *ptr = 42; }
// as before // as before
@@ -347,7 +347,7 @@ pub extern "C" fn _start() -> ! {
```rust ```rust
// Note: The actual address might be different for you. Use the address that // Note: The actual address might be different for you. Use the address that
// your page fault handler reports. // your page fault handler reports.
let ptr = 0x2031b2 as *mut u32; let ptr = 0x2031b2 as *mut u8;
// read from a code page // read from a code page
unsafe { let x = *ptr; } unsafe { let x = *ptr; }

4
blog/content/edition-2/posts/08-paging-introduction/index.ja.md
View File

@@ -329,7 +329,7 @@ pub extern "C" fn _start() -> ! {
blog_os::init(); blog_os::init();
// ここを追加 // ここを追加
let ptr = 0xdeadbeaf as *mut u32; let ptr = 0xdeadbeaf as *mut u8;
unsafe { *ptr = 42; } unsafe { *ptr = 42; }
// ここはこれまでと同じ // ここはこれまでと同じ
@@ -354,7 +354,7 @@ pub extern "C" fn _start() -> ! {
```rust ```rust
// 注意：実際のアドレスは個々人で違うかもしれません。 // 注意：実際のアドレスは個々人で違うかもしれません。
// あなたのページフォルトハンドラが報告した値を使ってください。 // あなたのページフォルトハンドラが報告した値を使ってください。
let ptr = 0x2031b2 as *mut u32; let ptr = 0x2031b2 as *mut u8;
// コードページから読み込む // コードページから読み込む
unsafe { let x = *ptr; } unsafe { let x = *ptr; }

4
blog/content/edition-2/posts/08-paging-introduction/index.md
View File

@@ -316,7 +316,7 @@ pub extern "C" fn _start() -> ! {
blog_os::init(); blog_os::init();
// new // new
let ptr = 0xdeadbeaf as *mut u32; let ptr = 0xdeadbeaf as *mut u8;
unsafe { *ptr = 42; } unsafe { *ptr = 42; }
// as before // as before
@@ -341,7 +341,7 @@ We see that the current instruction pointer is `0x2031b2`, so we know that this
```rust ```rust
// Note: The actual address might be different for you. Use the address that // Note: The actual address might be different for you. Use the address that
// your page fault handler reports. // your page fault handler reports.
let ptr = 0x2031b2 as *mut u32; let ptr = 0x2031b2 as *mut u8;
// read from a code page // read from a code page
unsafe { let x = *ptr; } unsafe { let x = *ptr; }

4
blog/content/edition-2/posts/08-paging-introduction/index.zh-CN.md
View File

@@ -325,7 +325,7 @@ pub extern "C" fn _start() -> ! {
blog_os::init(); blog_os::init();
// new // new
let ptr = 0xdeadbeaf as *mut u32; let ptr = 0xdeadbeaf as *mut u8;
unsafe { *ptr = 42; } unsafe { *ptr = 42; }
// as before // as before
@@ -350,7 +350,7 @@ pub extern "C" fn _start() -> ! {
```rust ```rust
// Note: The actual address might be different for you. Use the address that // Note: The actual address might be different for you. Use the address that
// your page fault handler reports. // your page fault handler reports.
let ptr = 0x2031b2 as *mut u32; let ptr = 0x2031b2 as *mut u8;
// read from a code page // read from a code page
unsafe { let x = *ptr; } unsafe { let x = *ptr; }