summaryrefslogtreecommitdiff
path: root/net/sctp
diff options
context:
space:
mode:
authorDaniel Borkmann <dborkman@redhat.com>2012-12-15 10:12:43 +0000
committerDavid S. Miller <davem@davemloft.net>2012-12-15 17:14:39 -0800
commit4cb9d6eaf85ecdd266a9a5c6d825c56ca9eefc14 (patch)
tree6941c8c9ad861f2ec9302cbabe7fe438e1c07517 /net/sctp
parentccb1c31a7a8744cd153a7d92b726a56b56ad61d3 (diff)
downloadlinux-3.10-4cb9d6eaf85ecdd266a9a5c6d825c56ca9eefc14.tar.gz
linux-3.10-4cb9d6eaf85ecdd266a9a5c6d825c56ca9eefc14.tar.bz2
linux-3.10-4cb9d6eaf85ecdd266a9a5c6d825c56ca9eefc14.zip
sctp: jsctp_sf_eat_sack: fix jprobes function signature mismatch
Commit 24cb81a6a (sctp: Push struct net down into all of the state machine functions) introduced the net structure into all state machine functions, but jsctp_sf_eat_sack was not updated, hence when SCTP association probing is enabled in the kernel, any simple SCTP client/server program from userspace will panic the kernel. Cc: Vlad Yasevich <vyasevich@gmail.com> Signed-off-by: Daniel Borkmann <dborkman@redhat.com> Acked-by: Vlad Yasevich <vyasevich@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sctp')
-rw-r--r--net/sctp/probe.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/sctp/probe.c b/net/sctp/probe.c
index bc6cd75cc1d..5f7518de2fd 100644
--- a/net/sctp/probe.c
+++ b/net/sctp/probe.c
@@ -122,7 +122,8 @@ static const struct file_operations sctpprobe_fops = {
.llseek = noop_llseek,
};
-sctp_disposition_t jsctp_sf_eat_sack(const struct sctp_endpoint *ep,
+sctp_disposition_t jsctp_sf_eat_sack(struct net *net,
+ const struct sctp_endpoint *ep,
const struct sctp_association *asoc,
const sctp_subtype_t type,
void *arg,