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.10-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.10 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
@@ -1073,9 +1073,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.10/usb-option-support-new-huawei-devices.patch
queue-3.10/dm-array-fix-a-reference-counting-bug-in-shadow_ablock.patch
queue-3.10/alsa-hda-hdmi-fix-iec958-ctl-indexes-for-some-simple-hdmi-devices.patch
queue-3.10/dm-table-fail-dm_table_create-on-dm_round_up-overflow.patch
queue-3.10/media-af9035-fix-broken-i2c-and-usb-i-o.patch
queue-3.10/sc1200_wdt-fix-oops.patch
queue-3.10/nfsv4-wait-on-recovery-for-async-session-errors.patch
queue-3.10/media-saa7164-fix-return-value-check-in-saa7164_initdev.patch
queue-3.10/arm-7913-1-fix-framepointer-check-in-unwind_frame.patch
queue-3.10/arm-pxa-tosa-fix-keys-mapping.patch
queue-3.10/input-usbtouchscreen-separate-report-and-transmit-buffer-size-handling.patch
queue-3.10/ath9k-fix-quickdrop-usage.patch
queue-3.10/kvm-x86-convert-vapic-synchronization-to-_cached-functions-cve-2013-6368.patch
queue-3.10/ath9k-fix-xlna-bias-strength.patch
queue-3.10/alsa-hda-add-static-dac-pin-mapping-for-ad1986a-codec.patch
queue-3.10/usb-gadget-composite-reset-delayed_status-on-reset_config.patch
queue-3.10/hwmon-hih-6130-support-i2c-bus-drivers-without-i2c_func_smbus_quick.patch
queue-3.10/drm-radeon-program-dce2-audio-dto-just-like-dce3.patch
queue-3.10/media-wm8775-fix-broken-audio-routing.patch
queue-3.10/kvm-improve-create-vcpu-parameter-cve-2013-4587.patch
queue-3.10/arm-omap3-hwmod-data-don-t-prevent-reset-of-usb-host-module.patch
queue-3.10/dm-space-map-metadata-return-on-failure-in-sm_metadata_new_block.patch
queue-3.10/kvm-x86-fix-guest-initiated-crash-with-x2apic-cve-2013-6376.patch
queue-3.10/media-af9035-unlock-on-error-in-af9035_i2c_master_xfer.patch
queue-3.10/usb-dwc3-fix-implementation-of-endpoint-wedge.patch
queue-3.10/x86-build-pass-in-additional-mno-mmx-mno-sse-options.patch
queue-3.10/drm-radeon-fixup-bad-vram-size-on-si.patch
queue-3.10/pci-disable-bus-master-only-on-kexec-reboot.patch
queue-3.10/dm-bufio-initialize-read-only-module-parameters.patch
queue-3.10/mwifiex-fix-memory-leak-issue-for-ibss-join.patch
queue-3.10/staging-comedi-drivers-use-comedi_dio_update_state-for-simple-cases.patch
queue-3.10/hwmon-prevent-some-divide-by-zeros-in-fan_to_reg.patch
queue-3.10/drivers-rtc-rtc-at91rm9200.c-correct-alarm-over-day-month-wrap.patch
queue-3.10/media-bttv-don-t-setup-the-controls-if-there-are-no-video-devices.patch
queue-3.10/btrfs-call-mnt_drop_write-after-interrupted-subvol-deletion.patch
queue-3.10/arm-pxa-prevent-pxa270-occasional-reboot-freezes.patch
queue-3.10/powerpc-fix-pte-page-address-mismatch-in-pgtable-ctor-dtor.patch
queue-3.10/dm-snapshot-avoid-snapshot-space-leak-on-crash.patch
queue-3.10/drm-i915-fix-pipe-csc-post-offset-calculation.patch
queue-3.10/input-xpad-add-signature-for-razer-onza-classic-edition.patch
queue-3.10/iwlwifi-mvm-check-sta_id-drain-values-in-debugfs.patch
queue-3.10/arm-7912-1-check-stack-pointer-in-get_wchan.patch
queue-3.10/nfs-fix-do_div-warning-by-instead-using-sector_div.patch
queue-3.10/usb-serial-option-blacklist-interface-1-for-huawei-e173s-6.patch
queue-3.10/dm-delay-fix-a-possible-deadlock-due-to-shared-workqueue.patch
queue-3.10/btrfs-fix-access_ok-check-in-btrfs_ioctl_send.patch
queue-3.10/staging-comedi-ssv_dnp-use-comedi_dio_update_state.patch
queue-3.10/alsa-compress-fix-64bit-abi-incompatibility.patch
queue-3.10/alsa-memalloc.h-fix-wrong-truncation-of-dma_addr_t.patch
queue-3.10/mac80211-don-t-attempt-to-reorder-multicast-frames.patch
queue-3.10/ip6tnl-fix-use-after-free-of-fb_tnl_dev.patch
queue-3.10/sched-avoid-throttle_cfs_rq-racing-with-period_timer-stopping.patch
queue-3.10/futex-fix-handling-of-read-only-mapped-hugepages.patch
queue-3.10/hwmon-w83l786ng-fix-fan-speed-control-mode-setting-and-reporting.patch
queue-3.10/x86-efi-don-t-use-u-efi-time-services-on-32-bit.patch
queue-3.10/selinux-handle-tcp-syn-ack-packets-correctly-in-selinux_ip_postroute.patch
queue-3.10/media-af9033-fix-broken-i2c.patch
queue-3.10/nfsd-when-reusing-an-existing-repcache-entry-unhash-it-first.patch
queue-3.10/xfs-underflow-bug-in-xfs_attrlist_by_handle.patch
queue-3.10/x86-build-icc-remove-uninitialized_var-from-compiler-intel.h.patch
queue-3.10/usb-hub-use-correct-reset-for-wedged-usb3-devices-that-are-notattached.patch
queue-3.10/cxd2820r_core-fix-sparse-warnings.patch
queue-3.10/kvm-x86-fix-potential-divide-by-0-in-lapic-cve-2013-6367.patch
queue-3.10/media-af9035-add-leadtek-winfast-dtv-dongle-dual.patch
queue-3.10/dm-thin-switch-to-read-only-mode-if-a-mapping-insert-fails.patch
queue-3.10/igb-fix-for-issue-where-values-could-be-too-high-for-udelay-function.patch
queue-3.10/revert-mac80211-allow-disable-power-save-in-mesh.patch
queue-3.10/alsa-hda-mute-all-aamix-inputs-as-default.patch
queue-3.10/hwmon-w83l768ng-fix-fan-speed-control-range.patch
queue-3.10/selinux-handle-tcp-syn-ack-packets-correctly-in-selinux_ip_output.patch
queue-3.10/mips-dma-for-bmips5000-cores-flush-region-just-like-non-coherent-r10000.patch
queue-3.10/revert-net-update-consumers-of-msg_more-to-recognize-msg_sendpage_notlast.patch
queue-3.10/xfs-growfs-overruns-agfl-buffer-on-v4-filesystems.patch
queue-3.10/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