[RHEL7,COMMIT] fs/fuse kio_pcs: replenish netaddr_cmp() with rdma type

Submitted by Konstantin Khorenko on Nov. 20, 2018, 9:41 a.m.

Details

Message ID 201811200941.wAK9fcX9000889@finist-ce7.sw.ru
State New
Series "fs/fuse kio_pcs: replenish netaddr_cmp() with rdma type"
Headers show

Commit Message

Konstantin Khorenko Nov. 20, 2018, 9:41 a.m.
The commit is pushed to "branch-rh7-3.10.0-862.20.2.vz7.73.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-862.20.2.vz7.73.6
------>
commit aa969198fadf0f322703092dee4e57de84b5c3a0
Author: Pavel Butsykin <pbutsykin@virtuozzo.com>
Date:   Tue Nov 20 12:41:37 2018 +0300

    fs/fuse kio_pcs: replenish netaddr_cmp() with rdma type
    
    Fast-path client doesn't support RDMA csd, but that is no reason for crash.
    Extend netaddr_cmp() with PCS_ADDRTYPE_RDMA to prevent kernel crashes in the
    future.
    
    https://pmc.acronis.com/browse/VSTOR-17784
    
    Signed-off-by: Pavel Butsykin <pbutsykin@virtuozzo.com>
---
 fs/fuse/kio/pcs/pcs_cs.c    | 1 +
 fs/fuse/kio/pcs/pcs_types.h | 1 +
 2 files changed, 2 insertions(+)

Patch hide | download patch | download mbox

diff --git a/fs/fuse/kio/pcs/pcs_cs.c b/fs/fuse/kio/pcs/pcs_cs.c
index 8ed1c8f91d99..00cd1ae99850 100644
--- a/fs/fuse/kio/pcs/pcs_cs.c
+++ b/fs/fuse/kio/pcs/pcs_cs.c
@@ -161,6 +161,7 @@  static inline int netaddr_cmp(PCS_NET_ADDR_T const *addr1, PCS_NET_ADDR_T const
 
 	switch (addr1->type) {
 	case PCS_ADDRTYPE_IP:
+	case PCS_ADDRTYPE_RDMA:
 		sz = sizeof(struct in_addr);
 		break;
 	case PCS_ADDRTYPE_IP6:
diff --git a/fs/fuse/kio/pcs/pcs_types.h b/fs/fuse/kio/pcs/pcs_types.h
index f5c886e49619..1170475c2226 100644
--- a/fs/fuse/kio/pcs/pcs_types.h
+++ b/fs/fuse/kio/pcs/pcs_types.h
@@ -26,6 +26,7 @@  enum
 	PCS_ADDRTYPE_IP = 1,
 	PCS_ADDRTYPE_IP6 = 2,
 	PCS_ADDRTYPE_UNIX = 3,
+	PCS_ADDRTYPE_RDMA = 4,
 };
 
 /* alignment makes it usable in binary protocols */