m7: Fix mismerge after 3.4.96

Change-Id: Idf4bb23001ef499668dcd3cda10a51023d354cb8
Revert "HID: core: fix validation of report id 0"

This reverts commit 87e0d5f5da2a9777a554fad531b1816c78976fca.
Revert "skbuff: skb_segment: orphan frags before copying"

This reverts commit 9acc7252467dafb61a06d1fdd940fe3f90bc4253.
skbuff: skb_segment: orphan frags before copying


commit 1fd819ecb90cc9b822cd84d3056ddba315d3340f upstream.

skb_segment copies frags around, so we need
to copy them carefully to avoid accessing
user memory after reporting completion to userspace
through a callback.

skb_segment doesn't normally happen on datapath:
TSO needs to be disabled - so disabling zero copy
in this case does not look like a big deal.

Change-Id: Id8b8c907477000d98496e069908d996552c6fe79
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Acked-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
[bwh: Backported to 3.2.  As skb_segment() only supports page-frags *or* a
 frag list, there is no need for the additional frag_skb pointer or the
 preparatory renaming.]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>