apache · yadvr · Aug 19, 2015 · jburwell · Aug 19, 2015 · yadvr
diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java
@@ -287,7 +287,7 @@ private void deleteExitingLinkLocalRouteTable(String linkLocalBr) {
            for (String line : lines) {
                String[] tokens = line.split(" ");
                if (!tokens[2].equalsIgnoreCase(linkLocalBr)) {
-                    Script.runSimpleBashScript("ip route del " + NetUtils.getLinkLocalCIDR());
+                    Script.runSimpleBashScript("ip route del " + NetUtils.getLinkLocalCIDR() + " dev " + tokens[2]);
                } else {
                    foundLinkLocalBr = true;
                }
-Original file line number
+Diff line change
@@ -287,7 +287,7 @@ private void deleteExitingLinkLocalRouteTable(String linkLocalBr) {
                 for (String line : lines) {
                     String[] tokens = line.split(" ");
                     if (!tokens[2].equalsIgnoreCase(linkLocalBr)) {
               Copy link

  
        
      
    

    
        

  
    Contributor


        

    
  

  
    
      
          
      

      
            jburwell
  

      

      

      


        Aug 19, 2015


      
    

  


        
      
  
  
  
    

    There was a problem hiding this comment.


  

 
  
    

    Choose a reason for hiding this comment

    
      The reason will be displayed to describe this comment to others. Learn more.
    

    
      
      


  


  
    
      I am concerned about the unchecked array access in the event of malformed/unexpected input.  Consider the following as a bit of extra safety in the event of malformed input beginning at line 289:
if (tokens != null && tokens.length < 2) {
   // Should we emit a log warning here to indicate that we received an unexpected string format?
   continue;
}

final String device = tokens[2];
if (!Strings.isNullOrEmpty(device) &&
    !device.equalsIgnoreCase(linkLocalBr)) {


    
  
  



    

        
      
  
  
    
  
  
  
    
    Sorry, something went wrong.
  

  
    
  
    
      

              Uh oh!

              
There was an error while loading. Please reload this page.


  
  


          
              
  
    
    
      
        
            
    All reactions
  


          
          
        
      
    


      



    
        
  
    
      
          
    
  


        
            
  
      
              Copy link

  
        
      
    

    
        

  
  Member


        

  Author


    
  

  
    
      
          
      

      
            yadvr
  

      

      

      


        Aug 19, 2015


      
    

  


        
      
  
  
  
    

    There was a problem hiding this comment.


  

 
  
    

    Choose a reason for hiding this comment

    
      The reason will be displayed to describe this comment to others. Learn more.
    

    
      
      


  


  
    
      For this PR we cannot make any changes now that it is merged already; perhaps send a new PR or I can pick it up later.
    
  
  



    

        
      
  
  
    
  
  
  
    
    Sorry, something went wrong.
  

  
    
  
    
      

              Uh oh!

              
There was an error while loading. Please reload this page.


  
  


          
              
  
    
    
      
        
            
    All reactions
-                        Script.runSimpleBashScript("ip route del " + NetUtils.getLinkLocalCIDR());
+                        Script.runSimpleBashScript("ip route del " + NetUtils.getLinkLocalCIDR() + " dev " + tokens[2]);
                     } else {
                         foundLinkLocalBr = true;
                     }
-          Expand Down