[linux] 01/02: Fix refresh of bugfix/all/bpf-fix-integer-overflows.patch patch

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

carnil pushed a commit to branch sid
in repository linux.

commit 345277742938892fba2e6b5a59f05ec4a2a777f8
Author: Salvatore Bonaccorso <carnil at debian.org>
Date:   Fri Jan 5 20:22:43 2018 +0100

    Fix refresh of bugfix/all/bpf-fix-integer-overflows.patch patch
    
    Gbp-Dch: Ignore
---
 .../bugfix/all/bpf-fix-integer-overflows.patch     | 34 ----------------------
 1 file changed, 34 deletions(-)

diff --git a/debian/patches/bugfix/all/bpf-fix-integer-overflows.patch b/debian/patches/bugfix/all/bpf-fix-integer-overflows.patch
index 1843bb2..a26b5f0 100644
--- a/debian/patches/bugfix/all/bpf-fix-integer-overflows.patch
+++ b/debian/patches/bugfix/all/bpf-fix-integer-overflows.patch
@@ -61,37 +61,3 @@ Signed-off-by: Daniel Borkmann <daniel at iogearbox.net>
  			smin, reg_type_str[type]);
  		return false;
  	}
-@@ -1919,6 +1919,10 @@ static int adjust_ptr_min_max_vals(struc
- 	    !check_reg_sane_offset(env, ptr_reg, ptr_reg->type))
- 		return -EINVAL;
- 
-+	if (!check_reg_sane_offset(env, off_reg, ptr_reg->type) ||
-+	    !check_reg_sane_offset(env, ptr_reg, ptr_reg->type))
-+		return -EINVAL;
-+
- 	switch (opcode) {
- 	case BPF_ADD:
- 		/* We can take a fixed offset as long as it doesn't overflow
-@@ -2052,6 +2056,9 @@ static int adjust_ptr_min_max_vals(struc
- 	if (!check_reg_sane_offset(env, dst_reg, ptr_reg->type))
- 		return -EINVAL;
- 
-+	if (!check_reg_sane_offset(env, dst_reg, ptr_reg->type))
-+		return -EINVAL;
-+
- 	__update_reg_bounds(dst_reg);
- 	__reg_deduce_bounds(dst_reg);
- 	__reg_bound_offset(dst_reg);
-@@ -2083,6 +2090,12 @@ static int adjust_scalar_min_max_vals(st
- 
- 	if (!src_known &&
- 	    opcode != BPF_ADD && opcode != BPF_SUB && opcode != BPF_AND) {
-+		__mark_reg_unknown(dst_reg);
-+		return 0;
-+	}
-+
-+	if (!src_known &&
-+	    opcode != BPF_ADD && opcode != BPF_SUB && opcode != BPF_AND) {
- 		__mark_reg_unknown(dst_reg);
- 		return 0;
- 	}

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git