From 18ef1479c797401c82c53d1aec43ea57ae4da222 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eduardo=20S=C3=A1nchez=20Mu=C3=B1oz?= <esm@eduardosm.net>
Date: Sun, 13 Sep 2020 14:33:11 +0200
Subject: [PATCH] Remove `af_alg_iv::as_slice` (which is unsound) and modify
trait implementations that depended on it.
Fixes https://github.com/rust-lang/libc/issues/1501.
---
src/unix/linux_like/android/mod.rs | 17 +++--------------
src/unix/linux_like/linux/mod.rs | 17 +++--------------
2 files changed, 6 insertions(+), 28 deletions(-)
diff --git a/src/unix/linux_like/android/mod.rs b/src/unix/linux_like/android/mod.rs
index 81d42fbc3b552..7c06e2907785d 100644
--- a/src/unix/linux_like/android/mod.rs
+++ b/src/unix/linux_like/android/mod.rs
@@ -583,20 +583,9 @@ cfg_if! {
}
}
- impl af_alg_iv {
- fn as_slice(&self) -> &[u8] {
- unsafe {
- ::core::slice::from_raw_parts(
- self.iv.as_ptr(),
- self.ivlen as usize
- )
- }
- }
- }
-
impl PartialEq for af_alg_iv {
fn eq(&self, other: &af_alg_iv) -> bool {
- *self.as_slice() == *other.as_slice()
+ self.ivlen == other.ivlen
}
}
@@ -605,14 +594,14 @@ cfg_if! {
impl ::fmt::Debug for af_alg_iv {
fn fmt(&self, f: &mut ::fmt::Formatter) -> ::fmt::Result {
f.debug_struct("af_alg_iv")
- .field("iv", &self.as_slice())
+ .field("ivlen", &self.ivlen)
.finish()
}
}
impl ::hash::Hash for af_alg_iv {
fn hash<H: ::hash::Hasher>(&self, state: &mut H) {
- self.as_slice().hash(state);
+ self.ivlen.hash(state);
}
}
}
diff --git a/src/unix/linux_like/linux/mod.rs b/src/unix/linux_like/linux/mod.rs
index 421e131ba4791..864dadecffae7 100644
--- a/src/unix/linux_like/linux/mod.rs
+++ b/src/unix/linux_like/linux/mod.rs
@@ -781,20 +781,9 @@ cfg_if! {
}
}
- impl af_alg_iv {
- fn as_slice(&self) -> &[u8] {
- unsafe {
- ::core::slice::from_raw_parts(
- self.iv.as_ptr(),
- self.ivlen as usize
- )
- }
- }
- }
-
impl PartialEq for af_alg_iv {
fn eq(&self, other: &af_alg_iv) -> bool {
- *self.as_slice() == *other.as_slice()
+ self.ivlen == other.ivlen
}
}
@@ -803,14 +792,14 @@ cfg_if! {
impl ::fmt::Debug for af_alg_iv {
fn fmt(&self, f: &mut ::fmt::Formatter) -> ::fmt::Result {
f.debug_struct("af_alg_iv")
- .field("iv", &self.as_slice())
+ .field("ivlen", &self.ivlen)
.finish()
}
}
impl ::hash::Hash for af_alg_iv {
fn hash<H: ::hash::Hasher>(&self, state: &mut H) {
- self.as_slice().hash(state);
+ self.ivlen.hash(state);
}
}