From 9eac3cda9de3144a18e86c8eda2428cbad1e732d Mon Sep 17 00:00:00 2001 From: Soumya Koduri Date: Thu, 4 Aug 2016 16:00:31 +0530 Subject: inode: Adjust lru_size while retiring entries in lru list As part of inode_table_destroy(), we first retire entries in the lru list but the lru_size is not adjusted accordingly. This may result in invalid memory reference in inode_table_prune if the lru_size > lru_limit. > Reviewed-on: http://review.gluster.org/15087 > Smoke: Gluster Build System > CentOS-regression: Gluster Build System > NetBSD-regression: NetBSD Build System > Reviewed-by: Raghavendra G > Reviewed-by: Prashanth Pai BUG: 1365746 Change-Id: I29ee3c03b0eaa8a118d06dc0cefba85877daf963 Signed-off-by: Soumya Koduri Signed-off-by: Oleksandr Natalenko Reviewed-on: http://review.gluster.org/15128 Smoke: Gluster Build System NetBSD-regression: NetBSD Build System Reviewed-by: Prashanth Pai CentOS-regression: Gluster Build System --- libglusterfs/src/inode.c | 9 +++++++++ libglusterfs/src/libglusterfs-messages.h | 10 +++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) (limited to 'libglusterfs') diff --git a/libglusterfs/src/inode.c b/libglusterfs/src/inode.c index b70b4a93957..e45fe0deb4a 100644 --- a/libglusterfs/src/inode.c +++ b/libglusterfs/src/inode.c @@ -1519,6 +1519,14 @@ inode_table_prune (inode_table_t *table) { while (table->lru_limit && table->lru_size > (table->lru_limit)) { + if (list_empty (&table->lru)) { + gf_msg_callingfn (THIS->name, GF_LOG_WARNING, 0, + LG_MSG_INVALID_INODE_LIST, + "Empty inode lru list found" + " but with (%d) lru_size", + table->lru_size); + break; + } entry = list_entry (table->lru.next, inode_t, list); @@ -1788,6 +1796,7 @@ inode_table_destroy (inode_table_t *inode_table) { inode_t, list); __inode_forget (trav, 0); __inode_retire (trav); + inode_table->lru_size--; } while (!list_empty (&inode_table->active)) { diff --git a/libglusterfs/src/libglusterfs-messages.h b/libglusterfs/src/libglusterfs-messages.h index d18f4cb3112..d2ad44e470e 100644 --- a/libglusterfs/src/libglusterfs-messages.h +++ b/libglusterfs/src/libglusterfs-messages.h @@ -36,7 +36,7 @@ */ #define GLFS_LG_BASE GLFS_MSGID_COMP_LIBGLUSTERFS -#define GLFS_LG_NUM_MESSAGES 206 +#define GLFS_LG_NUM_MESSAGES 207 #define GLFS_LG_MSGID_END (GLFS_LG_BASE + GLFS_LG_NUM_MESSAGES + 1) /* Messaged with message IDs */ #define glfs_msg_start_lg GLFS_LG_BASE, "Invalid: Start of messages" @@ -1756,6 +1756,14 @@ */ #define LG_MSG_PTHREAD_ATTR_INIT_FAILED (GLFS_LG_BASE + 206) +/*! + * @messageid + * @diagnosis + * @recommendedaction + * + */ +#define LG_MSG_INVALID_INODE_LIST (GLFS_LG_BASE + 207) + /*! * @messageid * @diagnosis -- cgit