diff --git a/fs/buffer.c b/fs/buffer.c
index 93324b06ecb480c0180d6d32320dd99800897773..9b169f2987b8f0efb3bc9c3cb9ad1137b801b922 100644
--- a/fs/buffer.c
+++ b/fs/buffer.c
@@ -2070,6 +2070,9 @@ static int __block_commit_write(struct inode *inode, struct page *page,
 	unsigned blocksize;
 	struct buffer_head *bh, *head;
 
+	if (!page_has_buffers(page))
+		return 0;
+
 	bh = head = page_buffers(page);
 	blocksize = bh->b_size;
 
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index 690f7866dc0cb46dd2040fe60afb686f0e0bd3da..d5b462d03978c1ff6927757947ae21ad1e7d1f4f 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -3089,6 +3089,11 @@ static int ext4_da_do_write_end(struct address_space *mapping,
 	bool disksize_changed = false;
 	loff_t new_i_size;
 
+	if (unlikely(!page_has_buffers(page))) {
+		unlock_page(page);
+		put_page(page);
+		return -EIO;
+	}
 	/*
 	 * block_write_end() will mark the inode as dirty with I_DIRTY_PAGES
 	 * flag, which all that's needed to trigger page writeback.