Merge remote-tracking branch 'grant/devicetree/next' into for-next

1 files changed, 2 insertions, 0 deletions

diff --git a/fs/ext4/xattr.c b/fs/ext4/xattr.c
index c081e34f717f..03e9bebba198 100644
--- a/fs/ext4/xattr.c
+++ b/fs/ext4/xattr.c
@@ -1350,6 +1350,8 @@ retry:
                                     s_min_extra_isize) {
                                         tried_min_extra_isize++;
                                         new_extra_isize = s_min_extra_isize;
+                                        kfree(is); is = NULL;
+                                        kfree(bs); bs = NULL;
                                         goto retry;
                                 }
                                 error = -1;