Merge branch 'nvme-4.10-fixes' of git://git.infradead.org/nvme into for-linus

Pull nvme target fixes from Sagi:

Given that its -rc6, I removed anything that is not
bug fix.

- nvmet-fc discard fix from Christoph
- queue disconnect fix from James
- nvmet-rdma dma sync fix from Parav
- Some more nvmet fixes

1 files changed, 1 insertions, 1 deletions

diff --git a/proto_ipv4.c b/proto_ipv4.c
index e2d22d8..e522a90 100644
--- a/proto_ipv4.c
+++ b/proto_ipv4.c
@@ -154,7 +154,7 @@ static void ipv4(struct pkt_buff *pkt)
 			 *       check and handle that
 			 */
 			opt_len = *(++opt);
-			if (opt_len > opts_len) {
+			if (opt_len < 2 || opt_len > opts_len) {
 				tprintf(", Len (%zd, invalid) ]\n", opt_len);
 				goto out;
 			} else