Skip to content

CLOUDSTACK-8749: Add checks to prevent malformed/unexpected input #733

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
asfgit merged 1 commit into from
Aug 26, 2015
Merged

CLOUDSTACK-8749: Add checks to prevent malformed/unexpected input #733

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
CLOUDSTACK-8749: Add checks to prevent malformed/unexpected input 
Based on @jburwell's comment on PR #718

This closes #733

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
  • Loading branch information
@yadvr
yadvr committed Aug 26, 2015
commit 2a382e000b55dc6bef065241886f316348dc979e
11 changes: 8 additions & 3 deletions plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@

import javax.naming.ConfigurationException;

import com.google.common.base.Strings;
import org.apache.log4j.Logger;
import org.libvirt.LibvirtException;

Expand Down Expand Up @@ -275,7 +276,7 @@ private void createControlNetwork() throws LibvirtException {
createControlNetwork(_bridges.get("linklocal"));
}

private void deleteExitingLinkLocalRouteTable(String linkLocalBr) {
private void deleteExistingLinkLocalRouteTable(String linkLocalBr) {
Script command = new Script("/bin/bash", _timeout);
command.add("-c");
command.add("ip route | grep " + NetUtils.getLinkLocalCIDR());
Expand All @@ -286,7 +287,11 @@ private void deleteExitingLinkLocalRouteTable(String linkLocalBr) {
String[] lines = parser.getLines().split("\\n");
for (String line : lines) {
String[] tokens = line.split(" ");
if (!tokens[2].equalsIgnoreCase(linkLocalBr)) {
if (tokens != null && tokens.length < 2) {
continue;
}
final String device = tokens[2];
if (!Strings.isNullOrEmpty(device) && !device.equalsIgnoreCase(linkLocalBr)) {
Script.runSimpleBashScript("ip route del " + NetUtils.getLinkLocalCIDR() + " dev " + tokens[2]);
} else {
foundLinkLocalBr = true;
Expand All @@ -300,7 +305,7 @@ private void deleteExitingLinkLocalRouteTable(String linkLocalBr) {
}

private void createControlNetwork(String privBrName) {
deleteExitingLinkLocalRouteTable(privBrName);
deleteExistingLinkLocalRouteTable(privBrName);
if (!isBridgeExists(privBrName)) {
Script.runSimpleBashScript("brctl addbr " + privBrName + "; ip link set " + privBrName + " up; ip address add 169.254.0.1/16 dev " + privBrName, _timeout);
}
Expand Down