diff options
| -rw-r--r-- | kernel.spec | 18 | ||||
| -rw-r--r-- | oom-fix-integer-overflow-of-points.patch | 100 | ||||
| -rw-r--r-- | sources | 2 | ||||
| -rw-r--r-- | x86-code-dump-fix-truncation.patch | 73 |
4 files changed, 6 insertions, 187 deletions
diff --git a/kernel.spec b/kernel.spec index b8f8622ea..74a27dd8d 100644 --- a/kernel.spec +++ b/kernel.spec @@ -54,7 +54,7 @@ Summary: The Linux kernel # For non-released -rc kernels, this will be appended after the rcX and # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3" # -%global baserelease 2 +%global baserelease 1 %global fedora_build %{baserelease} # base_sublevel is the kernel version we're starting with and patching @@ -87,7 +87,7 @@ Summary: The Linux kernel # The rc snapshot level %define rcrev 6 # The git snapshot level -%define gitrev 1 +%define gitrev 2 # Set rpm version accordingly %define rpmversion 3.%{upstream_sublevel}.0 %endif @@ -716,8 +716,6 @@ Patch20000: utrace.patch Patch21000: arm-omap-dt-compat.patch Patch21001: arm-smsc-support-reading-mac-address-from-device-tree.patch -Patch21070: oom-fix-integer-overflow-of-points.patch - Patch21080: sysfs-msi-irq-per-device.patch Patch21090: bcma-brcmsmac-compat.patch @@ -730,9 +728,6 @@ Patch21029: nfsv4-include-bitmap-in-nfsv4_get_acl_data.patch #rhbz 590880 Patch21030: alps.patch -# rhbz 736815 -Patch21040: x86-code-dump-fix-truncation.patch - #rhbz 717735 Patch21045: nfs-client-freezer.patch @@ -1400,9 +1395,6 @@ ApplyPatch efi-dont-map-boot-services-on-32bit.patch # utrace. ApplyPatch utrace.patch -#rhbz 750402 -ApplyPatch oom-fix-integer-overflow-of-points.patch - # Add msi irq ennumeration in sysfs for devices ApplyPatch sysfs-msi-irq-per-device.patch @@ -1419,9 +1411,6 @@ ApplyPatch nfsv4-include-bitmap-in-nfsv4_get_acl_data.patch #rhbz 590880 ApplyPatch alps.patch -# rhbz 736815 -ApplyPatch x86-code-dump-fix-truncation.patch - #rhbz 717735 ApplyPatch nfs-client-freezer.patch @@ -2233,6 +2222,9 @@ fi # ||----w | # || || %changelog +* Tue Dec 20 2011 Dave Jones <davej@redhat.com> - 3.2.0-0.rc6.git2.1 +- Linux 3.2-rc6-git2 (a4a4923919f2d43583789b1f3603f4e5600d8321) + * Tue Dec 20 2011 Josh Boyer <jwboyer@redhat.com> - Include crtsaves.o for ppc64 as well (rhbz #769415) - Drop EDID headers patch from 751589 for now (rhbz #769103) diff --git a/oom-fix-integer-overflow-of-points.patch b/oom-fix-integer-overflow-of-points.patch deleted file mode 100644 index 02f6a8f72..000000000 --- a/oom-fix-integer-overflow-of-points.patch +++ /dev/null @@ -1,100 +0,0 @@ - -Delivered-To: jwboyer@gmail.com -Received: by 10.220.45.11 with SMTP id c11cs62970vcf; - Mon, 31 Oct 2011 08:56:49 -0700 (PDT) -Received: by 10.101.15.19 with SMTP id s19mr2706064ani.103.1320076596057; - Mon, 31 Oct 2011 08:56:36 -0700 (PDT) -Return-Path: <linux-kernel-owner@vger.kernel.org> -Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) - by mx.google.com with ESMTP id x8si7676575ani.27.2011.10.31.08.56.32; - Mon, 31 Oct 2011 08:56:36 -0700 (PDT) -Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; -Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mail=linux-kernel-owner@vger.kernel.org -Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand - id S934545Ab1JaP4X (ORCPT <rfc822;mel.lkml@gmail.com> + 99 others); - Mon, 31 Oct 2011 11:56:23 -0400 -Received: from mx1.redhat.com ([209.132.183.28]:23653 "EHLO mx1.redhat.com" - rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP - id S934538Ab1JaP4X (ORCPT <rfc822;linux-kernel@vger.kernel.org>); - Mon, 31 Oct 2011 11:56:23 -0400 -Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) - by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p9VFuHOO027543 - (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); - Mon, 31 Oct 2011 11:56:18 -0400 -Received: from dhcp-26-164.brq.redhat.com (dhcp-26-164.brq.redhat.com [10.34.26.164]) - by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p9VFuEK3018476; - Mon, 31 Oct 2011 11:56:15 -0400 -From: Frantisek Hrbata <fhrbata@redhat.com> -To: rientjes@google.com -Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, - akpm@linux-foundation.org, kosaki.motohiro@jp.fujitsu.com, - oleg@redhat.com, minchan.kim@gmail.com, stable@kernel.org, - eteo@redhat.com, pmatouse@redhat.com -Subject: [PATCH v2] oom: fix integer overflow of points in oom_badness -Date: Mon, 31 Oct 2011 16:56:09 +0100 -Message-Id: <1320076569-23872-1-git-send-email-fhrbata@redhat.com> -In-Reply-To: <1320048865-13175-1-git-send-email-fhrbata@redhat.com> -References: <1320048865-13175-1-git-send-email-fhrbata@redhat.com> -X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 -Sender: linux-kernel-owner@vger.kernel.org -Precedence: bulk -List-ID: <linux-kernel.vger.kernel.org> -X-Mailing-List: linux-kernel@vger.kernel.org - -An integer overflow will happen on 64bit archs if task's sum of rss, swapents -and nr_ptes exceeds (2^31)/1000 value. This was introduced by commit - -f755a04 oom: use pte pages in OOM score - -where the oom score computation was divided into several steps and it's no -longer computed as one expression in unsigned long(rss, swapents, nr_pte are -unsigned long), where the result value assigned to points(int) is in -range(1..1000). So there could be an int overflow while computing - -176 points *= 1000; - -and points may have negative value. Meaning the oom score for a mem hog task -will be one. - -196 if (points <= 0) -197 return 1; - -For example: -[ 3366] 0 3366 35390480 24303939 5 0 0 oom01 -Out of memory: Kill process 3366 (oom01) score 1 or sacrifice child - -Here the oom1 process consumes more than 24303939(rss)*4096~=92GB physical -memory, but it's oom score is one. - -In this situation the mem hog task is skipped and oom killer kills another and -most probably innocent task with oom score greater than one. - -The points variable should be of type long instead of int to prevent the int -overflow. - -Signed-off-by: Frantisek Hrbata <fhrbata@redhat.com> ---- - mm/oom_kill.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/mm/oom_kill.c b/mm/oom_kill.c -index 626303b..e9a1785 100644 ---- a/mm/oom_kill.c -+++ b/mm/oom_kill.c -@@ -162,7 +162,7 @@ static bool oom_unkillable_task(struct task_struct *p, - unsigned int oom_badness(struct task_struct *p, struct mem_cgroup *mem, - const nodemask_t *nodemask, unsigned long totalpages) - { -- int points; -+ long points; - - if (oom_unkillable_task(p, mem, nodemask)) - return 0; --- -1.7.6.4 - --- -To unsubscribe from this list: send the line "unsubscribe linux-kernel" in -the body of a message to majordomo@vger.kernel.org -More majordomo info at http://vger.kernel.org/majordomo-info.html -Please read the FAQ at http://www.tux.org/lkml/ @@ -1,4 +1,4 @@ 8d43453f8159b2332ad410b19d86a931 linux-3.1.tar.bz2 020a0ea456f0f061bf8d7c52c3670421 patch-3.2-rc6.xz -aa87e7d3593118a2680c8eda45c88e0d patch-3.2-rc6-git1.xz b5f0924b0547918ca1e1685811554315 compat-wireless-2011-12-18.tar.bz2 +e810c6acfc7c251c159e5825dce78122 patch-3.2-rc6-git2.xz diff --git a/x86-code-dump-fix-truncation.patch b/x86-code-dump-fix-truncation.patch deleted file mode 100644 index dcd5a815c..000000000 --- a/x86-code-dump-fix-truncation.patch +++ /dev/null @@ -1,73 +0,0 @@ -From: Clemens Ladisch <clemens@ladisch.de> -Date: Mon, 19 Dec 2011 21:07:58 +0000 (+0100) -Subject: x86, dumpstack: Fix code bytes breakage due to missing KERN_CONT -X-Git-Url: https://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftip%2Ftip.git;a=commitdiff_plain;h=13f541c10b30fc6529200d7f9a0073217709622f - -x86, dumpstack: Fix code bytes breakage due to missing KERN_CONT - -When printing the code bytes in show_registers(), the markers around the -byte at the fault address could make the printk() format string look -like a valid log level and facility code. This would prevent this byte -from being printed and result in a spurious newline: - -[ 7555.765589] Code: 8b 32 e9 94 00 00 00 81 7d 00 ff 00 00 00 0f 87 96 00 00 00 48 8b 83 c0 00 00 00 44 89 e2 44 89 e6 48 89 df 48 8b 80 d8 02 00 00 -[ 7555.765683] 8b 48 28 48 89 d0 81 e2 ff 0f 00 00 48 c1 e8 0c 48 c1 e0 04 - -Add KERN_CONT where needed, and elsewhere in show_registers() for -consistency. - -Signed-off-by: Clemens Ladisch <clemens@ladisch.de> -Link: http://lkml.kernel.org/r/4EEFA7AE.9020407@ladisch.de -Signed-off-by: H. Peter Anvin <hpa@linux.intel.com> ---- - -diff --git a/arch/x86/kernel/dumpstack_32.c b/arch/x86/kernel/dumpstack_32.c -index 3b97a80..c99f9ed 100644 ---- a/arch/x86/kernel/dumpstack_32.c -+++ b/arch/x86/kernel/dumpstack_32.c -@@ -116,16 +116,16 @@ void show_registers(struct pt_regs *regs) - for (i = 0; i < code_len; i++, ip++) { - if (ip < (u8 *)PAGE_OFFSET || - probe_kernel_address(ip, c)) { -- printk(" Bad EIP value."); -+ printk(KERN_CONT " Bad EIP value."); - break; - } - if (ip == (u8 *)regs->ip) -- printk("<%02x> ", c); -+ printk(KERN_CONT "<%02x> ", c); - else -- printk("%02x ", c); -+ printk(KERN_CONT "%02x ", c); - } - } -- printk("\n"); -+ printk(KERN_CONT "\n"); - } - - int is_valid_bugaddr(unsigned long ip) -diff --git a/arch/x86/kernel/dumpstack_64.c b/arch/x86/kernel/dumpstack_64.c -index 19853ad..6d728d9 100644 ---- a/arch/x86/kernel/dumpstack_64.c -+++ b/arch/x86/kernel/dumpstack_64.c -@@ -284,16 +284,16 @@ void show_registers(struct pt_regs *regs) - for (i = 0; i < code_len; i++, ip++) { - if (ip < (u8 *)PAGE_OFFSET || - probe_kernel_address(ip, c)) { -- printk(" Bad RIP value."); -+ printk(KERN_CONT " Bad RIP value."); - break; - } - if (ip == (u8 *)regs->ip) -- printk("<%02x> ", c); -+ printk(KERN_CONT "<%02x> ", c); - else -- printk("%02x ", c); -+ printk(KERN_CONT "%02x ", c); - } - } -- printk("\n"); -+ printk(KERN_CONT "\n"); - } - - int is_valid_bugaddr(unsigned long ip) |