fix: remove UFFDIO_WRITEPROTECT from linux4_11/4_14 modules

roypat · roypat · commit e7ad4f3a54d7 · 2025-08-18T10:38:29.000+01:00
This ioctl was only added in linux 5.7 [1], so remove the bindings for the ioctl number from the 4_11 and 4_14 features. The actual writeprotect functionality was already gated behind the linux5_7 feature. [1]: https://man7.org/linux/man-pages/man2/UFFDIO_WRITEPROTECT.2const.html Signed-off-by: Patrick Roy <roypat@amazon.co.uk>
diff --git a/userfaultfd-sys/src/linux4_11.rs b/userfaultfd-sys/src/linux4_11.rs
@@ -29,7 +29,6 @@ pub const UFFDIO_UNREGISTER: u32 = 0x8010aa01;
 pub const UFFDIO_WAKE: u32 = 0x8010aa02;
 pub const UFFDIO_COPY: u32 = 0xc028aa03;
 pub const UFFDIO_ZEROPAGE: u32 = 0xc020aa04;
-pub const UFFDIO_WRITEPROTECT: u32 = 0xc018aa06;
 
 #[cfg(test)]
 mod const_tests {
@@ -51,7 +50,6 @@ mod const_tests {
         static _const_UFFDIO_WAKE: u32;
         static _const_UFFDIO_COPY: u32;
         static _const_UFFDIO_ZEROPAGE: u32;
-        static _const_UFFDIO_WRITEPROTECT: u32;
     }
 
     #[test]
@@ -96,10 +94,6 @@ mod const_tests {
             assert_eq!(UFFDIO_WAKE, _const_UFFDIO_WAKE, "UFFDIO_WAKE");
             assert_eq!(UFFDIO_COPY, _const_UFFDIO_COPY, "UFFDIO_COPY");
             assert_eq!(UFFDIO_ZEROPAGE, _const_UFFDIO_ZEROPAGE, "UFFDIO_ZEROPAGE");
-            assert_eq!(
-                UFFDIO_WRITEPROTECT, _const_UFFDIO_WRITEPROTECT,
-                "UFFDIO_WRITEPROTECT"
-            );
         }
     }
 }
diff --git a/userfaultfd-sys/src/linux4_14.rs b/userfaultfd-sys/src/linux4_14.rs
@@ -32,7 +32,6 @@ pub const UFFDIO_UNREGISTER: u32 = 0x8010aa01;
 pub const UFFDIO_WAKE: u32 = 0x8010aa02;
 pub const UFFDIO_COPY: u32 = 0xc028aa03;
 pub const UFFDIO_ZEROPAGE: u32 = 0xc020aa04;
-pub const UFFDIO_WRITEPROTECT: u32 = 0xc018aa06;
 
 #[cfg(test)]
 mod const_tests {
@@ -55,7 +54,6 @@ mod const_tests {
         static _const_UFFDIO_WAKE: u32;
         static _const_UFFDIO_COPY: u32;
         static _const_UFFDIO_ZEROPAGE: u32;
-        static _const_UFFDIO_WRITEPROTECT: u32;
     }
 
     #[test]
@@ -104,10 +102,6 @@ mod const_tests {
             assert_eq!(UFFDIO_WAKE, _const_UFFDIO_WAKE, "UFFDIO_WAKE");
             assert_eq!(UFFDIO_COPY, _const_UFFDIO_COPY, "UFFDIO_COPY");
             assert_eq!(UFFDIO_ZEROPAGE, _const_UFFDIO_ZEROPAGE, "UFFDIO_ZEROPAGE");
-            assert_eq!(
-                UFFDIO_WRITEPROTECT, _const_UFFDIO_WRITEPROTECT,
-                "UFFDIO_WRITEPROTECT"
-            );
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,6 @@ pub const UFFDIO_UNREGISTER: u32 = 0x8010aa01;`
`29`	`29`	`pub const UFFDIO_WAKE: u32 = 0x8010aa02;`
`30`	`30`	`pub const UFFDIO_COPY: u32 = 0xc028aa03;`
`31`	`31`	`pub const UFFDIO_ZEROPAGE: u32 = 0xc020aa04;`
`32`		`-pub const UFFDIO_WRITEPROTECT: u32 = 0xc018aa06;`
`33`	`32`
`34`	`33`	`#[cfg(test)]`
`35`	`34`	`mod const_tests {`
`@@ -51,7 +50,6 @@ mod const_tests {`
`51`	`50`	`static _const_UFFDIO_WAKE: u32;`
`52`	`51`	`static _const_UFFDIO_COPY: u32;`
`53`	`52`	`static _const_UFFDIO_ZEROPAGE: u32;`
`54`		`- static _const_UFFDIO_WRITEPROTECT: u32;`
`55`	`53`	`}`
`56`	`54`
`57`	`55`	`#[test]`
`@@ -96,10 +94,6 @@ mod const_tests {`
`96`	`94`	`assert_eq!(UFFDIO_WAKE, _const_UFFDIO_WAKE, "UFFDIO_WAKE");`
`97`	`95`	`assert_eq!(UFFDIO_COPY, _const_UFFDIO_COPY, "UFFDIO_COPY");`
`98`	`96`	`assert_eq!(UFFDIO_ZEROPAGE, _const_UFFDIO_ZEROPAGE, "UFFDIO_ZEROPAGE");`
`99`		`- assert_eq!(`
`100`		`- UFFDIO_WRITEPROTECT, _const_UFFDIO_WRITEPROTECT,`
`101`		`- "UFFDIO_WRITEPROTECT"`
`102`		`- );`
`103`	`97`	`}`
`104`	`98`	`}`
`105`	`99`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,6 @@ pub const UFFDIO_UNREGISTER: u32 = 0x8010aa01;`
`32`	`32`	`pub const UFFDIO_WAKE: u32 = 0x8010aa02;`
`33`	`33`	`pub const UFFDIO_COPY: u32 = 0xc028aa03;`
`34`	`34`	`pub const UFFDIO_ZEROPAGE: u32 = 0xc020aa04;`
`35`		`-pub const UFFDIO_WRITEPROTECT: u32 = 0xc018aa06;`
`36`	`35`
`37`	`36`	`#[cfg(test)]`
`38`	`37`	`mod const_tests {`
`@@ -55,7 +54,6 @@ mod const_tests {`
`55`	`54`	`static _const_UFFDIO_WAKE: u32;`
`56`	`55`	`static _const_UFFDIO_COPY: u32;`
`57`	`56`	`static _const_UFFDIO_ZEROPAGE: u32;`
`58`		`- static _const_UFFDIO_WRITEPROTECT: u32;`
`59`	`57`	`}`
`60`	`58`
`61`	`59`	`#[test]`
`@@ -104,10 +102,6 @@ mod const_tests {`
`104`	`102`	`assert_eq!(UFFDIO_WAKE, _const_UFFDIO_WAKE, "UFFDIO_WAKE");`
`105`	`103`	`assert_eq!(UFFDIO_COPY, _const_UFFDIO_COPY, "UFFDIO_COPY");`
`106`	`104`	`assert_eq!(UFFDIO_ZEROPAGE, _const_UFFDIO_ZEROPAGE, "UFFDIO_ZEROPAGE");`
`107`		`- assert_eq!(`
`108`		`- UFFDIO_WRITEPROTECT, _const_UFFDIO_WRITEPROTECT,`
`109`		`- "UFFDIO_WRITEPROTECT"`
`110`		`- );`
`111`	`105`	`}`
`112`	`106`	`}`
`113`	`107`	`}`