diff --git a/go.mod b/go.mod index bc2c1960158..3a8ccd71303 100644 --- a/go.mod +++ b/go.mod @@ -3,6 +3,7 @@ module github.com/opencontainers/runc go 1.14 require ( + github.com/AdaLogics/go-fuzz-headers v0.0.0-20210330150358-dbd898e17899 github.com/checkpoint-restore/go-criu/v5 v5.0.0 github.com/cilium/ebpf v0.2.0 github.com/containerd/console v1.0.1 diff --git a/go.sum b/go.sum index b8283a93944..91533d3b8cc 100644 --- a/go.sum +++ b/go.sum @@ -1,4 +1,6 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +github.com/AdaLogics/go-fuzz-headers v0.0.0-20210330150358-dbd898e17899 h1:Cm0cjER/2C+3BEuRBARZ+1HG+jwU5jbVkYysA7zE2H8= +github.com/AdaLogics/go-fuzz-headers v0.0.0-20210330150358-dbd898e17899/go.mod h1:CzsSbkDixRphAF5hS6wbMKq0eI6ccJRb7/A0M6JBnwg= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/checkpoint-restore/go-criu/v5 v5.0.0 h1:TW8f/UvntYoVDMN1K2HlT82qH1rb0sOjpGw3m6Ym+i4= @@ -97,7 +99,6 @@ golang.org/x/sys v0.0.0-20191115151921-52ab43148777/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200909081042-eff7692f9009/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200916030750-2334cc1a136f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201119102817-f84b799fce68 h1:nxC68pudNYkKU6jWhgrqdreuFiOQWj1Fs7T3VrH4Pjw= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c h1:VwygUrnw9jn88c4u8GD3rZQbqrP/tgas88tPUbBxQrk= golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -125,7 +126,6 @@ google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQ google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.23.0 h1:4MY060fB1DLGMB/7MBTLnwQUY6+F09GEiz6SsrNqyzM= google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.25.0 h1:Ejskq+SyPohKW+1uil0JJMtmHCgJPJ/qWTxr8qp+R4c= diff --git a/libcontainer/libcontainer_fuzzer.go b/libcontainer/libcontainer_fuzzer.go new file mode 100644 index 00000000000..8291e76b375 --- /dev/null +++ b/libcontainer/libcontainer_fuzzer.go @@ -0,0 +1,96 @@ +// +build gofuzz + +package libcontainer + +import ( + "os" + + gofuzzheaders "github.com/AdaLogics/go-fuzz-headers" + "github.com/opencontainers/runc/libcontainer/configs" + "github.com/sirupsen/logrus" +) + +func FuzzStateApi(data []byte) int { + // We do not want any log output: + logrus.SetLevel(logrus.PanicLevel) + + if len(data) < 4 { + return -1 + } + + // Create the root dir: + root, err := newTestRoot() + if err != nil { + return -1 + } + defer os.RemoveAll(root) + + // Create a fuzzconsumer for later user + c := gofuzzheaders.NewConsumer(data) + + // Create a config + config := new(configs.Config) + c.GenerateStruct(config) + config.Rootfs = root + + // Add Namespaces: + ns, err := c.GetInt() + if err != nil { + return -1 + } + if (ns % 3) == 0 { + config.Namespaces = configs.Namespaces( + []configs.Namespace{ + {Type: configs.NEWUTS}, + }, + ) + } else if (ns % 4) == 0 { + config.Namespaces = configs.Namespaces( + []configs.Namespace{ + {Type: configs.NEWNS}, + }, + ) + } else { + config.Namespaces = []configs.Namespace{} + } + + // Create container: + containerName, err := c.GetString() + if err != nil { + return 0 + } + container, err := newContainerWithName(containerName, root, config) + if err != nil { + return 0 + } + defer container.Destroy() + + // Fuzz container APIs: + _, _ = container.State() + _, _ = container.Stats() + _, _ = container.OCIState() + _, _ = container.Processes() + return 1 +} + +func newContainerWithName(name, root string, config *configs.Config) (Container, error) { + f, err := New(root, Cgroupfs) + if err != nil { + return nil, err + } + if config.Cgroups != nil && config.Cgroups.Parent == "system.slice" { + f, err = New(root, SystemdCgroups) + if err != nil { + return nil, err + } + } + return f.Create(name, config) +} + +func newTestRoot() (string, error) { + dir := "/tmp/fuzzing" + if err := os.MkdirAll(dir, 0700); err != nil { + return "", err + } + return dir, nil +} diff --git a/tests/fuzzing/oss_fuzz_build.sh b/tests/fuzzing/oss_fuzz_build.sh index f0750e254b1..09d50f48167 100755 --- a/tests/fuzzing/oss_fuzz_build.sh +++ b/tests/fuzzing/oss_fuzz_build.sh @@ -11,3 +11,7 @@ compile_go_fuzzer ./libcontainer/system FuzzUIDMap id_map_fuzzer linux compile_go_fuzzer ./libcontainer/user FuzzUser user_fuzzer compile_go_fuzzer ./libcontainer/configs FuzzUnmarshalJSON configs_fuzzer +compile_go_fuzzer ./libcontainer FuzzStateApi state_api_fuzzer + +zip $OUT/state_api_fuzzer_seed_corpus.zip $SRC/runc/tests/fuzzing/corpus/state_fuzzer_seed_1 +mv $SRC/runc/tests/fuzzing/dictionaries/state_api_fuzzer.dict $OUT/ diff --git a/vendor/github.com/AdaLogics/go-fuzz-headers/LICENSE b/vendor/github.com/AdaLogics/go-fuzz-headers/LICENSE new file mode 100644 index 00000000000..261eeb9e9f8 --- /dev/null +++ b/vendor/github.com/AdaLogics/go-fuzz-headers/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/vendor/github.com/AdaLogics/go-fuzz-headers/README.md b/vendor/github.com/AdaLogics/go-fuzz-headers/README.md new file mode 100644 index 00000000000..604363c4e05 --- /dev/null +++ b/vendor/github.com/AdaLogics/go-fuzz-headers/README.md @@ -0,0 +1,33 @@ +# go-fuzz-headers +This repository contains various helper functions to be used with [go-fuzz](https://github.com/dvyukov/go-fuzz) + +The project is under development and will be updated regularly. + +## Usage +To make use of the helper functions, a ConsumeFuzzer has to be instantiated: +```go +f := NewConsumer(data) +``` +To split the input data from the fuzzer into a random set of equally large chunks: +```go +err := f.Split(3, 6) +``` +...after which the consumer has the following available attributes: +```go +f.CommandPart = commandPart +f.RestOfArray = restOfArray +f.NumberOfCalls = numberOfCalls +``` +To pass the input data from the fuzzer into a struct: +```go +ts := new(target_struct) +err :=f.GenerateStruct(ts) +``` +`GenerateStruct` will then pass data from the input data to the targeted struct. Currently the following field types are supported: +1. `string` +2. `bool` +3. `int` +4. `[]string` +5. `[]byte` + +Support for more types will be added over time, and no modifications are required to fuzzers that use `GenerateStruct` to adapt to new types. diff --git a/vendor/github.com/AdaLogics/go-fuzz-headers/consumer.go b/vendor/github.com/AdaLogics/go-fuzz-headers/consumer.go new file mode 100644 index 00000000000..326fcfa90ea --- /dev/null +++ b/vendor/github.com/AdaLogics/go-fuzz-headers/consumer.go @@ -0,0 +1,181 @@ +package gofuzzheaders + +import ( + "errors" + "reflect" +) + +type ConsumeFuzzer struct { + data []byte + CommandPart []byte + RestOfArray []byte + NumberOfCalls int + position int +} + +func IsDivisibleBy(n int, divisibleby int) bool { + return (n % divisibleby) == 0 +} + +func NewConsumer(fuzzData []byte) *ConsumeFuzzer { + f := &ConsumeFuzzer{data: fuzzData, position: 0} + return f +} + +func (f *ConsumeFuzzer) Split(minCalls, maxCalls int) error { + if len(f.data) == 0 { + return errors.New("Could not split") + } + numberOfCalls := int(f.data[0]) + if numberOfCalls < minCalls || numberOfCalls > maxCalls { + return errors.New("Bad number of calls") + + } + if len(f.data) < numberOfCalls+numberOfCalls+1 { + return errors.New("Length of data does not match required parameters") + } + + // Define part 2 and 3 of the data array + commandPart := f.data[1 : numberOfCalls+1] + restOfArray := f.data[numberOfCalls+1:] + + // Just a small check. It is necessary + if len(commandPart) != numberOfCalls { + return errors.New("Length of commandPart does not match number of calls") + } + + // Check if restOfArray is divisible by numberOfCalls + if !IsDivisibleBy(len(restOfArray), numberOfCalls) { + return errors.New("Length of commandPart does not match number of calls") + } + f.CommandPart = commandPart + f.RestOfArray = restOfArray + f.NumberOfCalls = numberOfCalls + return nil +} + +func (f *ConsumeFuzzer) GenerateStruct(targetStruct interface{}) error { + if f.position >= len(f.data) { + return errors.New("Not enough bytes to proceed") + } + e := reflect.ValueOf(targetStruct).Elem() + for i := 0; i < e.NumField(); i++ { + fieldtype := e.Type().Field(i).Type.String() + switch ft := fieldtype; ft { + case "string": + stringChunk, err := f.GetString() + if err != nil { + return err + } + e.Field(i).SetString(stringChunk) + case "bool": + newBool, err := f.GetBool() + if err != nil { + return err + } + e.Field(i).SetBool(newBool) + case "int": + newInt, err := f.GetInt() + if err != nil { + return err + } + e.Field(i).SetInt(int64(newInt)) + case "[]string": + newStringArray, err := f.GetStringArray() + if err != nil { + return err + } + if e.Field(i).CanSet() { + e.Field(i).Set(newStringArray) + } + case "[]byte": + newBytes, err := f.GetBytes() + if err != nil { + return err + } + e.Field(i).SetBytes(newBytes) + default: + continue + } + } + return nil +} + +func (f *ConsumeFuzzer) GetStringArray() (reflect.Value, error) { + // The max size of the array: + max := 20 + + arraySize := f.position + if arraySize>max { + arraySize = max + } + elemType := reflect.TypeOf("string") + stringArray := reflect.MakeSlice(reflect.SliceOf(elemType), arraySize, arraySize) + if f.position+arraySize >= len(f.data) { + return stringArray, errors.New("Could not make string array") + } + + for i:=0; i= len(f.data) { + return stringArray, nil + } + stringToAppend := string(f.data[f.position:f.position+stringSize]) + strVal := reflect.ValueOf(stringToAppend) + stringArray = reflect.Append(stringArray, strVal) + f.position = f.position + stringSize + } + return stringArray, nil +} + +func (f *ConsumeFuzzer) GetInt() (int, error) { + if f.position >= len(f.data) { + return 0, errors.New("Not enough bytes to create int") + } + returnInt := int(f.data[f.position]) + f.position++ + return returnInt, nil +} + +func (f *ConsumeFuzzer) GetBytes() ([]byte, error) { + if f.position >= len(f.data) { + return nil, errors.New("Not enough bytes to create byte array") + } + length := int(f.data[f.position]) + if length==0 { + return nil, errors.New("Zero-length is not supported") + } + if f.position+length >= len(f.data) { + return nil, errors.New("Not enough bytes to create byte array") + } + b := f.data[f.position : f.position+length] + f.position = f.position + length + return b, nil +} + +func (f *ConsumeFuzzer) GetString() (string, error) { + if f.position >= len(f.data) { + return "nil", errors.New("Not enough bytes to create string") + } + length := int(f.data[f.position]) + if f.position+length >= len(f.data) { + return "nil", errors.New("Not enough bytes to create string") + } + str := string(f.data[f.position : f.position+length]) + f.position = f.position + length + return str, nil +} + +func (f *ConsumeFuzzer) GetBool() (bool, error) { + if f.position >= len(f.data) { + return false, errors.New("Not enough bytes to create bool") + } + if IsDivisibleBy(int(f.data[f.position]), 2) { + f.position++ + return true, nil + } else { + f.position++ + return false, nil + } +} diff --git a/vendor/github.com/AdaLogics/go-fuzz-headers/go.mod b/vendor/github.com/AdaLogics/go-fuzz-headers/go.mod new file mode 100644 index 00000000000..ed96e69b849 --- /dev/null +++ b/vendor/github.com/AdaLogics/go-fuzz-headers/go.mod @@ -0,0 +1,3 @@ +module github.com/AdaLogics/go-fuzz-headers + +go 1.13 diff --git a/vendor/modules.txt b/vendor/modules.txt index caae0f098b0..d83db5cbcc0 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1,3 +1,6 @@ +# github.com/AdaLogics/go-fuzz-headers v0.0.0-20210330150358-dbd898e17899 +## explicit +github.com/AdaLogics/go-fuzz-headers # github.com/checkpoint-restore/go-criu/v5 v5.0.0 ## explicit github.com/checkpoint-restore/go-criu/v5