Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux

[linux.git] / net / netfilter / nf_conntrack_proto_sctp.c

diff --git a/net/netfilter/nf_conntrack_proto_sctp.c b/net/netfilter/nf_conntrack_proto_sctp.c
index 522c08c23600b067ab8835a307b78602395d8ed1..fce3d93f154181e9b5a884f2afedde818fa09bc2 100644 (file)
--- a/net/netfilter/nf_conntrack_proto_sctp.c
+++ b/net/netfilter/nf_conntrack_proto_sctp.c
@@ -336,7 +336,7 @@ static bool sctp_error(struct sk_buff *skb,
        if (state->hook == NF_INET_PRE_ROUTING &&
            state->net->ct.sysctl_checksum &&
            skb->ip_summed == CHECKSUM_NONE) {
-               if (!skb_make_writable(skb, dataoff + sizeof(struct sctphdr))) {
+               if (skb_ensure_writable(skb, dataoff + sizeof(*sh))) {
                        logmsg = "nf_ct_sctp: failed to read header ";
                        goto out_invalid;
                }