diff for duplicates of <20100713102217.2835.75779.sendpatchset@danny.redhat> diff --git a/a/1.txt b/N1/1.txt index 1085c92..6c6f379 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -40,9 +40,3 @@ index d8a05e4..3eb53fc 100644 return usage; -- 1.7.1.1 - --- -To unsubscribe, send a message with 'unsubscribe linux-mm' in -the body to majordomo@kvack.org. For more info on Linux MM, -see: http://www.linux-mm.org/ . -Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a> diff --git a/a/content_digest b/N1/content_digest index 0bb4cee..e42e946 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -57,12 +57,6 @@ " \n" " \treturn usage;\n" "-- \n" - "1.7.1.1\n" - "\n" - "--\n" - "To unsubscribe, send a message with 'unsubscribe linux-mm' in\n" - "the body to majordomo@kvack.org. For more info on Linux MM,\n" - "see: http://www.linux-mm.org/ .\n" - "Don't email: <a href=mailto:\"dont@kvack.org\"> email@kvack.org </a>" + 1.7.1.1 -9f013633d5b931d13f9e7f9c46708c0fb368c06d941e4a437ae8a3d234aef120 +a4f9178a18690d8f254d2a83eca3dbccdce83660ebc50f660e2f90292624ddbb
diff --git a/a/1.txt b/N2/1.txt index 1085c92..8b13789 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -1,48 +1 @@ ->From ea7b13006f42f7dcadd1bfb874d5e525b4c259e3 Mon Sep 17 00:00:00 2001 -From: Xiaotian Feng <dfeng@redhat.com> -Date: Tue, 13 Jul 2010 13:44:08 +0800 -Subject: [PATCH 29/30] fix null pointer deref in swap_entry_free -Commit b3a27d uses p->bdev->bd_disk, this will lead a null pointer -deref with swap over nfs. - -Signed-off-by: Xiaotian Feng <dfeng@redhat.com> ---- - mm/swapfile.c | 9 +++++---- - 1 files changed, 5 insertions(+), 4 deletions(-) - -diff --git a/mm/swapfile.c b/mm/swapfile.c -index d8a05e4..3eb53fc 100644 ---- a/mm/swapfile.c -+++ b/mm/swapfile.c -@@ -577,7 +577,6 @@ static unsigned char swap_entry_free(struct swap_info_struct *p, - - /* free if no reference */ - if (!usage) { -- struct gendisk *disk = p->bdev->bd_disk; - if (offset < p->lowest_bit) - p->lowest_bit = offset; - if (offset > p->highest_bit) -@@ -587,9 +586,11 @@ static unsigned char swap_entry_free(struct swap_info_struct *p, - swap_list.next = p->type; - nr_swap_pages++; - p->inuse_pages--; -- if ((p->flags & SWP_BLKDEV) && -- disk->fops->swap_slot_free_notify) -- disk->fops->swap_slot_free_notify(p->bdev, offset); -+ if (p->flags & SWP_BLKDEV) { -+ struct gendisk *disk = p->bdev->bd_disk; -+ if (disk->fops->swap_slot_free_notify) -+ disk->fops->swap_slot_free_notify(p->bdev, offset); -+ } - } - - return usage; --- -1.7.1.1 - --- -To unsubscribe, send a message with 'unsubscribe linux-mm' in -the body to majordomo@kvack.org. For more info on Linux MM, -see: http://www.linux-mm.org/ . -Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a> diff --git a/a/content_digest b/N2/content_digest index 0bb4cee..522cc95 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -16,53 +16,5 @@ " davem@davemloft.net\0" "\00:1\0" "b\0" - ">From ea7b13006f42f7dcadd1bfb874d5e525b4c259e3 Mon Sep 17 00:00:00 2001\n" - "From: Xiaotian Feng <dfeng@redhat.com>\n" - "Date: Tue, 13 Jul 2010 13:44:08 +0800\n" - "Subject: [PATCH 29/30] fix null pointer deref in swap_entry_free\n" - "\n" - "Commit b3a27d uses p->bdev->bd_disk, this will lead a null pointer\n" - "deref with swap over nfs.\n" - "\n" - "Signed-off-by: Xiaotian Feng <dfeng@redhat.com>\n" - "---\n" - " mm/swapfile.c | 9 +++++----\n" - " 1 files changed, 5 insertions(+), 4 deletions(-)\n" - "\n" - "diff --git a/mm/swapfile.c b/mm/swapfile.c\n" - "index d8a05e4..3eb53fc 100644\n" - "--- a/mm/swapfile.c\n" - "+++ b/mm/swapfile.c\n" - "@@ -577,7 +577,6 @@ static unsigned char swap_entry_free(struct swap_info_struct *p,\n" - " \n" - " \t/* free if no reference */\n" - " \tif (!usage) {\n" - "-\t\tstruct gendisk *disk = p->bdev->bd_disk;\n" - " \t\tif (offset < p->lowest_bit)\n" - " \t\t\tp->lowest_bit = offset;\n" - " \t\tif (offset > p->highest_bit)\n" - "@@ -587,9 +586,11 @@ static unsigned char swap_entry_free(struct swap_info_struct *p,\n" - " \t\t\tswap_list.next = p->type;\n" - " \t\tnr_swap_pages++;\n" - " \t\tp->inuse_pages--;\n" - "-\t\tif ((p->flags & SWP_BLKDEV) &&\n" - "-\t\t\t\tdisk->fops->swap_slot_free_notify)\n" - "-\t\t\tdisk->fops->swap_slot_free_notify(p->bdev, offset);\n" - "+\t\tif (p->flags & SWP_BLKDEV) {\n" - "+\t\t\tstruct gendisk *disk = p->bdev->bd_disk;\n" - "+\t\t\tif (disk->fops->swap_slot_free_notify)\n" - "+\t\t\t\tdisk->fops->swap_slot_free_notify(p->bdev, offset);\n" - "+\t\t}\n" - " \t}\n" - " \n" - " \treturn usage;\n" - "-- \n" - "1.7.1.1\n" - "\n" - "--\n" - "To unsubscribe, send a message with 'unsubscribe linux-mm' in\n" - "the body to majordomo@kvack.org. For more info on Linux MM,\n" - "see: http://www.linux-mm.org/ .\n" - "Don't email: <a href=mailto:\"dont@kvack.org\"> email@kvack.org </a>" -9f013633d5b931d13f9e7f9c46708c0fb368c06d941e4a437ae8a3d234aef120 +cb41d5e874e4a63106497b941ab072248c34669fb78341726a81af20300f2aec
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.