Check that --ip-range is a CIDR address

Signed-off-by: Rob Murray <rob.murray@docker.com>

Author: robmry

cli/command/network/create.go

@@ -163,6 +163,9 @@ func createIPAMConfig(options ipamOptions) (*network.IPAM, error) {
 	for _, r := range options.ipRanges {
 		match := false
 		for _, s := range options.subnets {
+			if _, _, err := net.ParseCIDR(r); err != nil {
+				return nil, err
+			}
 			ok, err := subnetMatches(s, r)
 			if err != nil {
 				return nil, err

cli/command/network/create_test.go

@@ -124,6 +124,15 @@ func TestNetworkCreateErrors(t *testing.T) {
 			},
 			expectedError: "no matching subnet for aux-address",
 		},
+		{
+			args: []string{"toto"},
+			flags: map[string]string{
+				"ip-range": "192.168.83.1-192.168.83.254",
+				"gateway":  "192.168.80.1",
+				"subnet":   "192.168.80.0/20",
+			},
+			expectedError: "invalid CIDR address: 192.168.83.1-192.168.83.254",
+		},
 	}
 
 	for _, tc := range testCases {