| From 7ce38ac6147d069c5b0b0ad8d53e069f38ef26ab Mon Sep 17 00:00:00 2001 |
| From: Daniel Borkmann <dborkman@redhat.com> |
| Date: Sat, 15 Dec 2012 10:12:43 +0000 |
| Subject: sctp: jsctp_sf_eat_sack: fix jprobes function signature mismatch |
| |
| |
| From: Daniel Borkmann <dborkman@redhat.com> |
| |
| [ Upstream commit 4cb9d6eaf85ecdd266a9a5c6d825c56ca9eefc14 ] |
| |
| 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> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| net/sctp/probe.c | 3 ++- |
| 1 file changed, 2 insertions(+), 1 deletion(-) |
| |
| --- a/net/sctp/probe.c |
| +++ b/net/sctp/probe.c |
| @@ -122,7 +122,8 @@ static const struct file_operations sctp |
| .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, |
