2 files changed, 20 insertions, 1 deletions

diff --git a/lib/kasprintf.c b/lib/kasprintf.c
index ae0de80c1c88..32f12150fc4f 100644
--- a/lib/kasprintf.c
+++ b/lib/kasprintf.c
@@ -21,7 +21,7 @@ char *kvasprintf(gfp_t gfp, const char *fmt, va_list ap)
         len = vsnprintf(NULL, 0, fmt, aq);
         va_end(aq);
 
-        p = kmalloc(len+1, gfp);
+        p = kmalloc_track_caller(len+1, gfp);
         if (!p)
                 return NULL;
 
diff --git a/lib/scatterlist.c b/lib/scatterlist.c
index e76d85cf3175..3675452b23ca 100644
--- a/lib/scatterlist.c
+++ b/lib/scatterlist.c
@@ -39,6 +39,25 @@ struct scatterlist *sg_next(struct scatterlist *sg)
 EXPORT_SYMBOL(sg_next);
 
 /**
+ * sg_nents - return total count of entries in scatterlist
+ * @sg:         The scatterlist
+ *
+ * Description:
+ * Allows to know how many entries are in sg, taking into acount
+ * chaining as well
+ *
+ **/
+int sg_nents(struct scatterlist *sg)
+{
+        int nents;
+        for (nents = 0; sg; sg = sg_next(sg))
+                nents++;
+        return nents;
+}
+EXPORT_SYMBOL(sg_nents);
+
+
+/**
  * sg_last - return the last scatterlist entry in a list
  * @sgl:        First entry in the scatterlist
  * @nents:      Number of entries in the scatterlist