3 files changed, 30 insertions, 5 deletions

diff --git a/net/dccp/ccid.h b/net/dccp/ccid.h
index 259f5469d7d0..803343aed004 100644
--- a/net/dccp/ccid.h
+++ b/net/dccp/ccid.h
@@ -116,6 +116,24 @@ extern struct ccid *ccid_hc_rx_new(unsigned char id, struct sock *sk,
 extern struct ccid *ccid_hc_tx_new(unsigned char id, struct sock *sk,
                                    gfp_t gfp);
 
+static inline int ccid_get_current_rx_ccid(struct dccp_sock *dp)
+{
+        struct ccid *ccid = dp->dccps_hc_rx_ccid;
+
+        if (ccid == NULL || ccid->ccid_ops == NULL)
+                return -1;
+        return ccid->ccid_ops->ccid_id;
+}
+
+static inline int ccid_get_current_tx_ccid(struct dccp_sock *dp)
+{
+        struct ccid *ccid = dp->dccps_hc_tx_ccid;
+
+        if (ccid == NULL || ccid->ccid_ops == NULL)
+                return -1;
+        return ccid->ccid_ops->ccid_id;
+}
+
 extern void ccid_hc_rx_delete(struct ccid *ccid, struct sock *sk);
 extern void ccid_hc_tx_delete(struct ccid *ccid, struct sock *sk);
 
diff --git a/net/dccp/probe.c b/net/dccp/probe.c
index 81368a7f5379..9ca783d74678 100644
--- a/net/dccp/probe.c
+++ b/net/dccp/probe.c
@@ -74,14 +74,11 @@ static void printl(const char *fmt, ...)
 static int jdccp_sendmsg(struct kiocb *iocb, struct sock *sk,
                          struct msghdr *msg, size_t size)
 {
-        const struct dccp_minisock *dmsk = dccp_msk(sk);
         const struct inet_sock *inet = inet_sk(sk);
-        const struct ccid3_hc_tx_sock *hctx;
+        struct ccid3_hc_tx_sock *hctx = NULL;
 
-        if (dmsk->dccpms_tx_ccid == DCCPC_CCID3)
+        if (ccid_get_current_tx_ccid(dccp_sk(sk)) == DCCPC_CCID3)
                 hctx = ccid3_hc_tx_sk(sk);
-        else
-                hctx = NULL;
 
         if (port == 0 || ntohs(inet->dport) == port ||
             ntohs(inet->sport) == port) {
diff --git a/net/dccp/proto.c b/net/dccp/proto.c
index 2cd56df44d8e..6550452d59e2 100644
--- a/net/dccp/proto.c
+++ b/net/dccp/proto.c
@@ -667,6 +667,16 @@ static int do_dccp_getsockopt(struct sock *sk, int level, int optname,
                 break;
         case DCCP_SOCKOPT_AVAILABLE_CCIDS:
                 return ccid_getsockopt_builtin_ccids(sk, len, optval, optlen);
+        case DCCP_SOCKOPT_TX_CCID:
+                val = ccid_get_current_tx_ccid(dp);
+                if (val < 0)
+                        return -ENOPROTOOPT;
+                break;
+        case DCCP_SOCKOPT_RX_CCID:
+                val = ccid_get_current_rx_ccid(dp);
+                if (val < 0)
+                        return -ENOPROTOOPT;
+                break;
         case DCCP_SOCKOPT_SERVER_TIMEWAIT:
                 val = dp->dccps_server_timewait;
                 break;