- up to 4.14.3

[packages/kernel.git] / kernel-small_fixes.patch

diff --git a/kernel-small_fixes.patch b/kernel-small_fixes.patch
index b615734d8a13f6283c4b505bd22528fe3aa31dfe..81d01fa5d8010ed2deeb2a05f0564b6b4925f757 100644 (file)
--- a/kernel-small_fixes.patch
+++ b/kernel-small_fixes.patch
@@ -27,40 +27,47 @@
                        fi
                done
 
-From:   Eric Sandeen <sandeen@redhat.com>
-Subject: [PATCH] xfs: don't wrap ID in xfs_dq_get_next_id
-Message-ID: <f52de68d-abe6-1960-c0ef-1d199346f689@redhat.com>
-Date:   Fri, 16 Dec 2016 18:05:20 -0600
-
-The GETNEXTQOTA ioctl takes whatever ID is sent in,
-and looks for the next active quota for an user
-equal or higher to that ID.
-
-But if we are at the maximum ID and then ask for the "next"
-one, we may wrap back to zero.  In this case, userspace
-may loop forever, because it will start querying again
-at zero.
-
-We'll fix this in userspace as well, but for the kernel,
-return -ENOENT if we ask for the next quota ID
-past UINT_MAX so the caller knows to stop.
-
-Signed-off-by: Eric Sandeen <sandeen@redhat.com>
----
-
-diff --git a/fs/xfs/xfs_dquot.c b/fs/xfs/xfs_dquot.c
-index 7a30b8f..dbeddd9 100644
---- a/fs/xfs/xfs_dquot.c
-+++ b/fs/xfs/xfs_dquot.c
-@@ -710,6 +710,10 @@
-       /* Simple advance */
-       next_id = *id + 1;
+; kernel-orc.patch
+Index: linux-2.6/tools/objtool/orc_dump.c
+===================================================================
+--- linux-2.6.orig/tools/objtool/orc_dump.c
++++ linux-2.6/tools/objtool/orc_dump.c
+@@ -76,7 +76,8 @@ int orc_dump(const char *_objname)
+       int fd, nr_entries, i, *orc_ip = NULL, orc_size = 0;
+       struct orc_entry *orc = NULL;
+       char *name;
+-      unsigned long nr_sections, orc_ip_addr = 0;
++      size_t nr_sections;
++      Elf64_Addr orc_ip_addr = 0;
+       size_t shstrtab_idx;
+       Elf *elf;
+       Elf_Scn *scn;
+@@ -187,10 +188,10 @@ int orc_dump(const char *_objname)
+                               return -1;
+                       }
  
-+      /* If we'd wrap past the max ID, stop */
-+      if (next_id < *id)
-+              return -ENOENT;
-+
-       /* If new ID is within the current chunk, advancing it sufficed */
-       if (next_id % mp->m_quotainfo->qi_dqperchunk) {
-               *id = next_id;
-
+-                      printf("%s+%lx:", name, rela.r_addend);
++                      printf("%s+%llx:", name, (unsigned long long)rela.r_addend);
+ 
+               } else {
+-                      printf("%lx:", orc_ip_addr + (i * sizeof(int)) + orc_ip[i]);
++                      printf("%llx:", (unsigned long long)(orc_ip_addr + (i * sizeof(int)) + orc_ip[i]));
+               }
+ 
+ 
+Index: linux-2.6/tools/objtool/Makefile
+===================================================================
+--- linux-2.6.orig/tools/objtool/Makefile
++++ linux-2.6/tools/objtool/Makefile
+@@ -7,8 +7,9 @@ ARCH := x86
+ endif
+ 
+ # always use the host compiler
+-CC = gcc
+-LD = ld
++CC = $(HOSTCC)
++HOSTLD ?= ld
++LD = $(HOSTLD)
+ AR = ar
+ 
+ ifeq ($(srctree),)