Attachment 1471485 Details for Bug 1609724 – [WIP] quota: prevent segfault in quota_lookup()

[patch] [WIP] quota: prevent segfault in quota_lookup()

0001-WIP-quota-prevent-segfault-in-quota_lookup.patch (text/plain), 1.86 KB, created by Niels de Vos on 2018-07-30 09:58:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Niels de Vos

Created: 2018-07-30 09:58:24 UTC

Size: 1.86 KB

patch

obsolete

>From 74a598829b9ef97f2f3076d2e401a1e4b4f525b8 Mon Sep 17 00:00:00 2001
>From: Niels de Vos <ndevos@redhat.com>
>Date: Mon, 30 Jul 2018 11:54:58 +0200
>Subject: [PATCH] [WIP] quota: prevent segfault in quota_lookup()
>
>This is an improvement for quota_lookup() that may prevent a segfault in
>case this->private == NULL.
>
>If this looks sane, other calls to WIND_IF_QUOTAOFF() should be
>corrected like this too.
>
>BUG: 1609724
>Change-Id: Id79109ec3e7f975d8e7069ef4414a3668b0622e2
>Signed-off-by: Niels de Vos <ndevos@redhat.com>
>---
> xlators/features/quota/src/quota.c | 2 +-
> xlators/features/quota/src/quota.h | 6 ++++--
> 2 files changed, 5 insertions(+), 3 deletions(-)
>
>diff --git a/xlators/features/quota/src/quota.c b/xlators/features/quota/src/quota.c
>index 54414025a..628ef71c4 100644
>--- a/xlators/features/quota/src/quota.c
>+++ b/xlators/features/quota/src/quota.c
>@@ -1660,7 +1660,7 @@ quota_lookup (call_frame_t *frame, xlator_t *this, loc_t *loc,
> 
>         priv = this->private;
> 
>-        WIND_IF_QUOTAOFF (priv->is_quota_on, off);
>+        WIND_IF_QUOTAOFF (priv && priv->is_quota_on, off);
> 
>         xattr_req = xattr_req ? dict_ref(xattr_req) : dict_new();
>         if (!xattr_req)
>diff --git a/xlators/features/quota/src/quota.h b/xlators/features/quota/src/quota.h
>index 9fe0e3e0a..f9f590688 100644
>--- a/xlators/features/quota/src/quota.h
>+++ b/xlators/features/quota/src/quota.h
>@@ -42,8 +42,10 @@
> #endif
> 
> #define WIND_IF_QUOTAOFF(is_quota_on, label)     \
>-        if (!is_quota_on)                       \
>-                goto label;
>+        do {                                     \
>+                if (!(is_quota_on))              \
>+                        goto label;              \
>+        } while (0)
> 
> #define QUOTA_WIND_FOR_INTERNAL_FOP(xdata, label)                          \
>         do {                                                               \
>-- 
>2.17.1
>

Actions: View | Diff

Attachments on bug 1609724: 1471465 | 1471480 | 1471485