This is a note to let you know that I've just added the patch titled
Revert "net: update consumers of MSG_MORE to recognize MSG_SENDPAGE_NOTLAST"
to the 3.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
revert-net-update-consumers-of-msg_more-to-recognize-msg_sendpage_notlast.patch
and it can be found in the queue-3.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From foo@baz Wed Dec 18 12:40:45 PST 2013
Date: Wed, 18 Dec 2013 12:40:45 -0800
To: Greg KH <gregkh@xxxxxxxxxxxxxxxxxxx>
From: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
Subject: Revert "net: update consumers of MSG_MORE to recognize MSG_SENDPAGE_NOTLAST"
It turns out that commit: d3f7d56a7a4671d395e8af87071068a195257bf6 was
applied to the tree twice, which didn't hurt anything, but it's good to
fix this up.
Reported-by: Veaceslav Falico <veaceslav@xxxxxxxxx>
Cc: David S. Miller <davem@xxxxxxxxxxxxx>
Cc: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Cc: Richard Weinberger <richard@xxxxxx>
Cc: Shawn Landden <shawnlandden@xxxxxxxxx>
Cc: Tom Herbert <therbert@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
crypto/algif_hash.c | 3 ---
crypto/algif_skcipher.c | 3 ---
net/ipv4/udp.c | 3 ---
3 files changed, 9 deletions(-)
--- a/crypto/algif_hash.c
+++ b/crypto/algif_hash.c
@@ -117,9 +117,6 @@ static ssize_t hash_sendpage(struct sock
if (flags & MSG_SENDPAGE_NOTLAST)
flags |= MSG_MORE;
- if (flags & MSG_SENDPAGE_NOTLAST)
- flags |= MSG_MORE;
-
lock_sock(sk);
sg_init_table(ctx->sgl.sg, 1);
sg_set_page(ctx->sgl.sg, page, size, offset);
--- a/crypto/algif_skcipher.c
+++ b/crypto/algif_skcipher.c
@@ -381,9 +381,6 @@ static ssize_t skcipher_sendpage(struct
if (flags & MSG_SENDPAGE_NOTLAST)
flags |= MSG_MORE;
- if (flags & MSG_SENDPAGE_NOTLAST)
- flags |= MSG_MORE;
-
lock_sock(sk);
if (!ctx->more && ctx->used)
goto unlock;
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@ -1042,9 +1042,6 @@ int udp_sendpage(struct sock *sk, struct
if (flags & MSG_SENDPAGE_NOTLAST)
flags |= MSG_MORE;
- if (flags & MSG_SENDPAGE_NOTLAST)
- flags |= MSG_MORE;
-
if (!up->pending) {
struct msghdr msg = { .msg_flags = flags|MSG_MORE };
Patches currently in stable-queue which might be from gregkh@xxxxxxxxxxxxxxxxxxx are
queue-3.4/usb-option-support-new-huawei-devices.patch
queue-3.4/dm-table-fail-dm_table_create-on-dm_round_up-overflow.patch
queue-3.4/sc1200_wdt-fix-oops.patch
queue-3.4/arm-7913-1-fix-framepointer-check-in-unwind_frame.patch
queue-3.4/arm-pxa-tosa-fix-keys-mapping.patch
queue-3.4/input-usbtouchscreen-separate-report-and-transmit-buffer-size-handling.patch
queue-3.4/usb-gadget-composite-reset-delayed_status-on-reset_config.patch
queue-3.4/hpfs-fix-warnings-when-the-filesystem-fills-up.patch
queue-3.4/kvm-improve-create-vcpu-parameter-cve-2013-4587.patch
queue-3.4/arm-omap3-hwmod-data-don-t-prevent-reset-of-usb-host-module.patch
queue-3.4/usb-dwc3-fix-implementation-of-endpoint-wedge.patch
queue-3.4/drm-radeon-fixup-bad-vram-size-on-si.patch
queue-3.4/dm-bufio-initialize-read-only-module-parameters.patch
queue-3.4/drivers-rtc-rtc-at91rm9200.c-correct-alarm-over-day-month-wrap.patch
queue-3.4/arm-7912-1-check-stack-pointer-in-get_wchan.patch
queue-3.4/nfs-fix-do_div-warning-by-instead-using-sector_div.patch
queue-3.4/usb-serial-option-blacklist-interface-1-for-huawei-e173s-6.patch
queue-3.4/dm-delay-fix-a-possible-deadlock-due-to-shared-workqueue.patch
queue-3.4/staging-comedi-ssv_dnp-use-comedi_dio_update_state.patch
queue-3.4/alsa-memalloc.h-fix-wrong-truncation-of-dma_addr_t.patch
queue-3.4/mac80211-don-t-attempt-to-reorder-multicast-frames.patch
queue-3.4/futex-fix-handling-of-read-only-mapped-hugepages.patch
queue-3.4/hwmon-w83l786ng-fix-fan-speed-control-mode-setting-and-reporting.patch
queue-3.4/x86-efi-don-t-use-u-efi-time-services-on-32-bit.patch
queue-3.4/selinux-handle-tcp-syn-ack-packets-correctly-in-selinux_ip_postroute.patch
queue-3.4/xfs-underflow-bug-in-xfs_attrlist_by_handle.patch
queue-3.4/usb-hub-use-correct-reset-for-wedged-usb3-devices-that-are-notattached.patch
queue-3.4/selinux-handle-tcp-syn-ack-packets-correctly-in-selinux_ip_output.patch
queue-3.4/mips-dma-for-bmips5000-cores-flush-region-just-like-non-coherent-r10000.patch
queue-3.4/revert-net-update-consumers-of-msg_more-to-recognize-msg_sendpage_notlast.patch
queue-3.4/staging-comedi-pcmuio-fix-possible-null-deref-on-detach.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html