diff options
| author | Jan Rękorajski | 2017-02-06 06:42:55 (GMT) |
|---|---|---|
| committer | Jan Rękorajski | 2017-02-06 06:42:55 (GMT) |
| commit | 80e83e0b62613eeadcf347dfa5c406e0b3eb2094 (patch) | |
| tree | e526c6445c6c2e51fe68e6542e60adefc34121de /kernel-small_fixes.patch | |
| parent | 1f39f5805eaa6b6861b4207ff523ecc871295554 (diff) | |
| download | kernel-80e83e0b62613eeadcf347dfa5c406e0b3eb2094.zip kernel-80e83e0b62613eeadcf347dfa5c406e0b3eb2094.tar.gz | |
Diffstat (limited to 'kernel-small_fixes.patch')
| -rw-r--r-- | kernel-small_fixes.patch | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/kernel-small_fixes.patch b/kernel-small_fixes.patch index 1bc4a8f..d4b6034 100644 --- a/kernel-small_fixes.patch +++ b/kernel-small_fixes.patch @@ -26,42 +26,3 @@ exit 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; - -+ /* 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; - - |