projects / packages / kernel.git / blame
| Commit | Line | Data |
|---|---|---|
| 08aa9d92 | 1 | --- linux-2.6.33/scripts/mod/modpost.c~ 2010-02-24 19:52:17.000000000 +0100 |
| 2 | +++ linux-2.6.33/scripts/mod/modpost.c 2010-03-07 14:26:47.242168558 +0100 | |
| 3 | @@ -15,7 +15,8 @@ | |
| 4 | #include <stdio.h> | |
| 5 | #include <ctype.h> | |
| 6 | #include "modpost.h" | |
| 7 | -#include "../../include/generated/autoconf.h" | |
| 8 | +// PLD architectures don't use CONFIG_SYMBOL_PREFIX | |
| 9 | +//#include "../../include/generated/autoconf.h" | |
| 10 | #include "../../include/linux/license.h" | |
| 11 | ||
| 12 | /* Some toolchains use a `_' prefix for all user symbols. */ | |
| 13 | ||
| 2136e199 AM |
14 | --- linux-3.0/scripts/kconfig/lxdialog/check-lxdialog.sh~ 2011-07-22 04:17:23.000000000 +0200 |
| 15 | +++ linux-3.0/scripts/kconfig/lxdialog/check-lxdialog.sh 2011-08-25 21:26:04.799150642 +0200 | |
| 16 | @@ -9,6 +9,12 @@ | |
| 17 | $cc -print-file-name=lib${lib}.${ext} | grep -q / | |
| 18 | if [ $? -eq 0 ]; then | |
| 19 | echo "-l${lib}" | |
| 20 | + for libt in tinfow tinfo ; do | |
| 21 | + $cc -print-file-name=lib${libt}.${ext} | grep -q / | |
| 22 | + if [ $? -eq 0 ]; then | |
| 23 | + echo "-l${libt}" | |
| 24 | + fi | |
| 25 | + done | |
| 26 | exit | |
| 27 | fi | |
| 28 | done | |
| 746b5ec8 | 29 | |
| 08da2677 AM |
30 | From: Eric Sandeen <sandeen@redhat.com> |
| 31 | Subject: [PATCH] xfs: don't wrap ID in xfs_dq_get_next_id | |
| 32 | Message-ID: <f52de68d-abe6-1960-c0ef-1d199346f689@redhat.com> | |
| 33 | Date: Fri, 16 Dec 2016 18:05:20 -0600 | |
| 34 | ||
| 35 | The GETNEXTQOTA ioctl takes whatever ID is sent in, | |
| 36 | and looks for the next active quota for an user | |
| 37 | equal or higher to that ID. | |
| 38 | ||
| 39 | But if we are at the maximum ID and then ask for the "next" | |
| 40 | one, we may wrap back to zero. In this case, userspace | |
| 41 | may loop forever, because it will start querying again | |
| 42 | at zero. | |
| 43 | ||
| 44 | We'll fix this in userspace as well, but for the kernel, | |
| 45 | return -ENOENT if we ask for the next quota ID | |
| 46 | past UINT_MAX so the caller knows to stop. | |
| 47 | ||
| 48 | Signed-off-by: Eric Sandeen <sandeen@redhat.com> | |
| 49 | --- | |
| 50 | ||
| 51 | diff --git a/fs/xfs/xfs_dquot.c b/fs/xfs/xfs_dquot.c | |
| 52 | index 7a30b8f..dbeddd9 100644 | |
| 53 | --- a/fs/xfs/xfs_dquot.c | |
| 54 | +++ b/fs/xfs/xfs_dquot.c | |
| 55 | @@ -710,6 +710,10 @@ | |
| 56 | /* Simple advance */ | |
| 57 | next_id = *id + 1; | |
| 58 | ||
| 59 | + /* If we'd wrap past the max ID, stop */ | |
| 60 | + if (next_id < *id) | |
| 61 | + return -ENOENT; | |
| 62 | + | |
| 63 | /* If new ID is within the current chunk, advancing it sufficed */ | |
| 64 | if (next_id % mp->m_quotainfo->qi_dqperchunk) { | |
| 65 | *id = next_id; | |
| 66 |